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

Replace "jet" package name with "kotlin" in testData

Browse Source
This commit is contained in:
Alexander Udalov
2014-02-21 23:29:57 +04:00
parent f2b4c7fa3e
commit f7b6457139
763 changed files with 2314 additions and 2310 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: (() -> jet.Unit)?): jet.Unit
public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.io.Closeable?): jet.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): jet.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 : java.lang.Object {
public constructor Super()
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit
public/*package*/ open fun foo(/*0*/ r: java.io.Closeable?): jet.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): jet.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: (() -> jet.Unit)?): jet.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): jet.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 : java.lang.Object {
public constructor Super()
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): jet.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
+4 -4
View File
@@ -2,12 +2,12 @@ package test
public final class Sub : test.Super {
public constructor Sub()
internal open override /*1*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): jet.Unit
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 open class Super : java.lang.Object {
public constructor Super()
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> jet.Unit)?): jet.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): jet.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/SamAdapterForInheritedFromKotlin.txt
+2 -2
View File
@@ -2,10 +2,10 @@ package test
public open class Sub : test.Super {
public constructor Sub()
internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable): jet.Unit
internal final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit
}
public final class Super {
public constructor Super()
internal final fun foo(/*0*/ r: java.lang.Runnable): jet.Unit
internal final fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt
+3 -3
View File
@@ -2,11 +2,11 @@ package test
public open class Sub : test.Super {
public constructor Sub()
public final /*synthesized*/ fun foo(/*0*/ r: () -> jet.Unit): jet.Unit
public open override /*1*/ fun foo(/*0*/ r: java.lang.Runnable): jet.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 {
public constructor Super()
internal final fun foo(/*0*/ r: java.lang.Runnable): jet.Unit
internal final fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/DeepSubclassingKotlinInJava.txt
+6 -6
View File
@@ -2,30 +2,30 @@ package test
public open class A {
public constructor A()
public open fun foo(): jet.String
public open fun foo(): kotlin.String
}
public open class B : test.A {
public constructor B()
public open override /*1*/ fun foo(): jet.String
public open override /*1*/ fun foo(): kotlin.String
}
public open class C : test.B {
public constructor C()
public open override /*1*/ fun foo(): jet.String
public open override /*1*/ fun foo(): kotlin.String
}
public open class D : test.C {
public constructor D()
public open override /*1*/ fun foo(): jet.String
public open override /*1*/ fun foo(): kotlin.String
}
public open class E : test.D {
public constructor E()
public open override /*1*/ fun foo(): jet.String
public open override /*1*/ fun foo(): kotlin.String
}
public open class F : test.E {
public constructor F()
public open override /*1*/ fun foo(): jet.String
public open override /*1*/ fun foo(): kotlin.String
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt
+8 -8
View File
@@ -1,18 +1,18 @@
package test
public trait Sub : test.Super1, test.Super2 {
public abstract override /*1*/ fun bar(/*0*/ vararg p: jet.String /*jet.Array<jet.String>*/): jet.Unit
public abstract override /*1*/ fun foo(/*0*/ p: jet.String): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun jet.Array<jet.String>.bar(): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun jet.String.foo(): jet.Unit
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*/ /*fake_override*/ fun kotlin.Array<kotlin.String>.bar(): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun kotlin.String.foo(): kotlin.Unit
}
public trait Super1 {
public abstract fun jet.Array<jet.String>.bar(): jet.Unit
public abstract fun jet.String.foo(): jet.Unit
public abstract fun kotlin.Array<kotlin.String>.bar(): kotlin.Unit
public abstract fun kotlin.String.foo(): kotlin.Unit
}
public trait Super2 {
public abstract fun bar(/*0*/ vararg p: jet.String /*jet.Array<jet.String>*/): jet.Unit
public abstract fun foo(/*0*/ p: jet.String): jet.Unit
public abstract fun bar(/*0*/ vararg p: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.String): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionFunction.txt
+4 -4
View File
@@ -2,12 +2,12 @@ package test
public open class Sub : test.Super {
public constructor Sub()
public open override /*1*/ fun jet.String.bar(/*0*/ param: jet.String): jet.String
public final override /*1*/ /*fake_override*/ fun jet.String.foo(): jet.Unit
public open override /*1*/ fun kotlin.String.bar(/*0*/ param: kotlin.String): kotlin.String
public final override /*1*/ /*fake_override*/ fun kotlin.String.foo(): kotlin.Unit
}
public open class Super {
public constructor Super()
public abstract fun jet.String.bar(/*0*/ p: jet.String): jet.Unit
public final fun jet.String.foo(): jet.Unit
public abstract fun kotlin.String.bar(/*0*/ p: kotlin.String): kotlin.Unit
public final fun kotlin.String.foo(): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt
+6 -6
View File
@@ -2,17 +2,17 @@ package test
internal open class Impl : test.Trait {
public constructor Impl()
internal open override /*1*/ /*fake_override*/ fun bar(): jet.String
internal open override /*1*/ /*fake_override*/ fun foo(): jet.String
internal open override /*1*/ /*fake_override*/ fun bar(): kotlin.String
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.String
}
public open class Subclass : test.Impl {
public constructor Subclass()
java.lang.Override() public open override /*1*/ fun bar(): jet.String
internal open override /*1*/ /*fake_override*/ fun foo(): jet.String
java.lang.Override() public open override /*1*/ fun bar(): kotlin.String
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.String
}
internal trait Trait {
internal open fun bar(): jet.String
internal open fun foo(): jet.String
internal open fun bar(): kotlin.String
internal open fun foo(): kotlin.String
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt
+2 -2
View File
@@ -2,10 +2,10 @@ package test
public open class JavaSubclass : test.KotlinClass {
public constructor JavaSubclass()
public open override /*1*/ fun foo(): jet.String
public open override /*1*/ fun foo(): kotlin.String
}
public open class KotlinClass {
public constructor KotlinClass()
public open fun foo(): jet.String
public open fun foo(): kotlin.String
}
compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt
+2 -2
View File
@@ -2,10 +2,10 @@ package test
public open class Base : java.lang.Object {
public constructor Base()
public/*package*/ open fun foo(): jet.Unit
public/*package*/ open fun foo(): kotlin.Unit
}
internal final class Derived : test.Base {
public constructor Derived()
internal open override /*1*/ fun foo(): jet.Unit
internal open override /*1*/ fun foo(): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt
+2 -2
View File
@@ -2,10 +2,10 @@ package test
public open class Base : java.lang.Object {
public constructor Base()
protected/*protected and package*/ open fun foo(): jet.Unit
protected/*protected and package*/ open fun foo(): kotlin.Unit
}
internal final class Derived : test.Base {
public constructor Derived()
protected open override /*1*/ fun foo(): jet.Unit
protected open override /*1*/ fun foo(): kotlin.Unit
}