azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Descriptor test data for diagnostic tests fixed

Browse Source
This commit is contained in:
Andrey Breslav
2014-09-24 15:07:39 +04:00
parent 25efd6684f
commit 6564231040
50 changed files with 15144 additions and 15171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.txt
+3 -3
View File
@@ -1,10 +1,10 @@
package
public open class J1 : KFirst<kotlin.Int> {
public open class J1 : KFirst<kotlin.Int!> {
public constructor J1()
public/*package*/ open fun baz(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ t: kotlin.Int): kotlin.Int
internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ t: kotlin.Int!): kotlin.Int!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -14,7 +14,7 @@ internal final class K2 : J1 {
internal final fun bar(): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun baz(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ t: kotlin.Int): kotlin.Int
internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ t: kotlin.Int!): kotlin.Int!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/j+k/OverrideVararg.txt
+1 -1
View File
@@ -3,7 +3,7 @@ package
public abstract class Aaa {
public constructor Aaa()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ vararg args: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
public abstract fun foo(/*0*/ vararg args: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt
+5 -5
View File
@@ -11,18 +11,18 @@ public open class A {
public open class X</*0*/ T> {
public constructor X</*0*/ T>()
public/*package*/ open fun barN(/*0*/ a: T): kotlin.Unit
public/*package*/ open fun barN(/*0*/ org.jetbrains.annotations.NotNull() a: T!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public/*package*/ open fun fooN(): T
org.jetbrains.annotations.NotNull() public/*package*/ open fun fooN(): T!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class Y : X<kotlin.String> {
public open class Y : X<kotlin.String!> {
public constructor Y()
public/*package*/ open override /*1*/ /*fake_override*/ fun barN(/*0*/ a: kotlin.String): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun barN(/*0*/ org.jetbrains.annotations.NotNull() a: kotlin.String!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public/*package*/ open override /*1*/ /*fake_override*/ fun fooN(): kotlin.String
org.jetbrains.annotations.NotNull() public/*package*/ open override /*1*/ /*fake_override*/ fun fooN(): kotlin.String!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt
+5 -5
View File
@@ -11,18 +11,18 @@ public open class A {
public open class X</*0*/ T> {
public constructor X</*0*/ T>()
public/*package*/ open fun barN(/*0*/ a: T): kotlin.Unit
public/*package*/ open fun barN(/*0*/ org.jetbrains.annotations.NotNull() a: T!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public/*package*/ open fun fooN(): T
org.jetbrains.annotations.NotNull() public/*package*/ open fun fooN(): T!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class Y : X<A> {
public open class Y : X<A!> {
public constructor Y()
public/*package*/ open override /*1*/ /*fake_override*/ fun barN(/*0*/ a: A): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun barN(/*0*/ org.jetbrains.annotations.NotNull() a: A!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public/*package*/ open override /*1*/ /*fake_override*/ fun fooN(): A
org.jetbrains.annotations.NotNull() public/*package*/ open override /*1*/ /*fake_override*/ fun fooN(): A!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.txt
+5 -5
View File
@@ -11,18 +11,18 @@ public open class A {
public open class X</*0*/ T> {
public constructor X</*0*/ T>()
public/*package*/ open fun bar(/*0*/ a: T?): kotlin.Unit
public/*package*/ open fun bar(/*0*/ a: T!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public/*package*/ open fun foo(): T?
public/*package*/ open fun foo(): T!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class Y : X<kotlin.String> {
public open class Y : X<kotlin.String!> {
public constructor Y()
public/*package*/ open override /*1*/ /*fake_override*/ fun bar(/*0*/ a: kotlin.String?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun bar(/*0*/ a: kotlin.String!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(): kotlin.String?
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(): kotlin.String!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.txt
+5 -5
View File
@@ -11,18 +11,18 @@ public open class A {
public open class X</*0*/ T> {
public constructor X</*0*/ T>()
public/*package*/ open fun bar(/*0*/ a: T?): kotlin.Unit
public/*package*/ open fun bar(/*0*/ a: T!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public/*package*/ open fun foo(): T?
public/*package*/ open fun foo(): T!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class Y : X<A> {
public open class Y : X<A!> {
public constructor Y()
public/*package*/ open override /*1*/ /*fake_override*/ fun bar(/*0*/ a: A?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun bar(/*0*/ a: A!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(): A?
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(): A!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/j+k/UnboxingNulls.txt
+1 -1
View File
@@ -7,7 +7,7 @@ package a {
public constructor Test</*0*/ T>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public/*package*/ open fun t(): T?
public/*package*/ open fun t(): T!
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.txt
+4 -4
View File
@@ -9,8 +9,8 @@ public open class A {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public final /*synthesized*/ fun foo(/*0*/ c: (() -> kotlin.Unit)?): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public open fun foo(/*0*/ c: java.io.Closeable?): kotlin.Unit
public open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ c: (() -> kotlin.Unit)!): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public open fun foo(/*0*/ c: java.io.Closeable!): kotlin.Unit
public open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.txt
+4 -4
View File
@@ -4,7 +4,7 @@ internal final class Sub1 : Super {
public constructor Sub1()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final override /*1*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -13,7 +13,7 @@ internal final class Sub2 : Super {
public constructor Sub2()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal open override /*1*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -21,8 +21,8 @@ internal final class Sub2 : Super {
public/*package*/ open class Super {
public/*package*/ constructor Super()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.txt
+9 -9
View File
@@ -1,31 +1,31 @@
package
public /*synthesized*/ fun A(/*0*/ function: (java.lang.Runnable?) -> kotlin.Unit): A
public /*synthesized*/ fun A(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): A
public trait A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public trait B : A {
public final /*synthesized*/ fun bar(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public abstract fun bar(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public final /*synthesized*/ fun bar(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun bar(/*0*/ r: java.lang.Runnable!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal final class C : B {
public constructor C()
public final override /*1*/ /*fake_override*/ fun bar(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public final override /*1*/ /*fake_override*/ fun bar(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public open override /*1*/ fun bar(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/j+k/kt2619.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package
internal fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
public final enum class Type : kotlin.Enum<Type> {
public final enum class Type : kotlin.Enum<Type!> {
public constructor Type()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/j+k/kt2890.txt
+1 -1
View File
@@ -10,6 +10,6 @@ package _03_collections {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
// Static members
public open fun add(/*0*/ ints: kotlin.List<kotlin.Int>?): kotlin.Unit
public open fun add(/*0*/ ints: kotlin.(Mutable)List<kotlin.Int!>!): kotlin.Unit
}
}
compiler/testData/diagnostics/tests/j+k/kt3307.txt
+2 -2
View File
@@ -5,7 +5,7 @@ internal fun TestBug(): kotlin.Unit
public trait Bug {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public abstract fun </*0*/ RET : Bug?> save(): RET?
public abstract fun </*0*/ RET : Bug!> save(): RET!
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -13,6 +13,6 @@ public open class SubBug : Bug {
public constructor SubBug()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open fun save(): SubBug?
public open fun save(): SubBug!
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/j+k/overrideRawType.txt
+4 -4
View File
@@ -1,10 +1,10 @@
package
public /*synthesized*/ fun Bar(/*0*/ function: (Foo<out kotlin.CharSequence?>?) -> kotlin.Unit): Bar
public /*synthesized*/ fun Bar(/*0*/ function: (Foo<out kotlin.CharSequence!>!) -> kotlin.Unit): Bar
public trait Bar {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun f(/*0*/ f: Foo<out kotlin.CharSequence?>?): kotlin.Unit
public abstract fun f(/*0*/ f: Foo<out kotlin.CharSequence!>!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -17,8 +17,8 @@ internal final class BarImpl : Bar {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class Foo</*0*/ T : kotlin.CharSequence?> {
public constructor Foo</*0*/ T : kotlin.CharSequence?>()
public open class Foo</*0*/ T : kotlin.CharSequence!> {
public constructor Foo</*0*/ T : kotlin.CharSequence!>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.txt
+1 -1
View File
@@ -11,6 +11,6 @@ package test {
// Static members
protected/*protected static*/ final var field: kotlin.Int
protected/*protected static*/ open fun method(): kotlin.String?
protected/*protected static*/ open fun method(): kotlin.String!
}
}
compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.txt
+4 -4
View File
@@ -1,9 +1,9 @@
package
internal fun foo(/*0*/ p: X): Bad<out Bad<out kotlin.Any?>?>?
internal fun foo(/*0*/ p: X): Bad<out Bad<out kotlin.Any?>!>!
public/*package*/ open class Bad</*0*/ T : Bad<out kotlin.Any?>?> {
public/*package*/ constructor Bad</*0*/ T : Bad<out kotlin.Any?>?>()
public/*package*/ open class Bad</*0*/ T : Bad<out kotlin.Any?>!> {
public/*package*/ constructor Bad</*0*/ T : Bad<out kotlin.Any?>!>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -12,7 +12,7 @@ public/*package*/ open class Bad</*0*/ T : Bad<out kotlin.Any?>?> {
public/*package*/ open class X {
public/*package*/ constructor X()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public/*package*/ open fun foo(): Bad<out Bad<out kotlin.Any?>?>?
public/*package*/ open fun foo(): Bad<out Bad<out kotlin.Any?>!>!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}