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

Test data fixed

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-30 17:14:34 +04:00
parent 195274370f
commit 0cbbb6a0db
72 changed files with 219 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt
+8 -8
View File
@@ -2,16 +2,16 @@ package test
public final class Sub : test.Super {
public constructor Sub()
public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.io.Closeable?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.io.Closeable!): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
public open class Super {
public constructor Super()
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.io.Closeable?): 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*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.io.Closeable!): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt
+4 -4
View File
@@ -2,12 +2,12 @@ package test
public final class Sub : test.Super {
public constructor Sub()
public/*package*/ final override /*1*/ /*fake_override*/ 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*/ final override /*1*/ /*fake_override*/ 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 open class Super {
public constructor Super()
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
}
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt
+3 -3
View File
@@ -3,11 +3,11 @@ package test
public final class Sub : test.Super {
public constructor Sub()
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 class Super {
public constructor Super()
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
}
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt
+2 -2
View File
@@ -2,8 +2,8 @@ package test
public open class Sub : test.Super {
public constructor Sub()
public final /*synthesized*/ fun foo(/*0*/ r: () -> kotlin.Unit): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
public final class Super {
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/DeepSubclassingKotlinInJava.txt
+3 -3
View File
@@ -7,7 +7,7 @@ public open class A {
public open class B : test.A {
public constructor B()
public open override /*1*/ fun foo(): kotlin.String
public open override /*1*/ fun foo(): kotlin.String!
}
public open class C : test.B {
@@ -17,7 +17,7 @@ public open class C : test.B {
public open class D : test.C {
public constructor D()
public open override /*1*/ fun foo(): kotlin.String
public open override /*1*/ fun foo(): kotlin.String!
}
public open class E : test.D {
@@ -27,5 +27,5 @@ public open class E : test.D {
public open class F : test.E {
public constructor F()
public open override /*1*/ fun foo(): kotlin.String
public open override /*1*/ fun foo(): kotlin.String!
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt
+2 -2
View File
@@ -1,8 +1,8 @@
package test
public trait Sub : test.Super1, test.Super2 {
public abstract override /*1*/ fun bar(/*0*/ vararg p: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String): kotlin.Unit
public abstract override /*1*/ fun bar(/*0*/ vararg p: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun kotlin.Array<kotlin.String>.bar(): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun kotlin.String.foo(): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionFunction.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public open class Sub : test.Super {
public constructor Sub()
public open override /*1*/ fun kotlin.String.bar(/*0*/ p: kotlin.String): kotlin.String
public open override /*1*/ fun kotlin.String!.bar(/*0*/ p: kotlin.String!): kotlin.String!
public final override /*1*/ /*fake_override*/ fun kotlin.String.foo(): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt
+1 -1
View File
@@ -8,7 +8,7 @@ internal open class Impl : test.Trait {
public open class Subclass : test.Impl {
public constructor Subclass()
java.lang.Override() public open override /*1*/ fun bar(): kotlin.String
java.lang.Override() public open override /*1*/ fun bar(): kotlin.String!
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.String
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public open class JavaSubclass : test.KotlinClass {
public constructor JavaSubclass()
public open override /*1*/ fun foo(): kotlin.String
public open override /*1*/ fun foo(): kotlin.String!
}
public open class KotlinClass {