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

Fixing test data after ordering in NamespaceComparator was fixed

Browse Source
This commit is contained in:
Andrey Breslav
2012-07-05 13:11:55 +04:00
parent 4d220fb980
commit 54ea8f1d00
39 changed files with 228 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/readKotlinBinaryClass/class/ClassInnerClass.txt
+1 -1
View File
@@ -1,8 +1,8 @@
namespace test
internal final class test.Outer : jet.Any {
public final /*constructor*/ fun <init>(): test.Outer
internal final class test.Outer.Inner : jet.Any {
public final /*constructor*/ fun <init>(): test.Outer.Inner
}
public final /*constructor*/ fun <init>(): test.Outer
}
compiler/testData/readKotlinBinaryClass/class/InnerClass.txt
+1 -1
View File
@@ -1,8 +1,8 @@
namespace test
internal final class test.Outer : jet.Any {
public final /*constructor*/ fun <init>(): test.Outer
internal final class test.Outer.Inner : jet.Any {
public final /*constructor*/ fun <init>(): test.Outer.Inner
}
public final /*constructor*/ fun <init>(): test.Outer
}
compiler/testData/readKotlinBinaryClass/class/InnerClassExtendInnerClass.txt
+4 -4
View File
@@ -1,11 +1,11 @@
namespace test
internal final class test.Outer : jet.Any {
internal final class test.Outer.Inner2 : test.Outer.Inner1 {
public final /*constructor*/ fun <init>(): test.Outer.Inner2
}
public final /*constructor*/ fun <init>(): test.Outer
internal open class test.Outer.Inner1 : jet.Any {
public final /*constructor*/ fun <init>(): test.Outer.Inner1
}
public final /*constructor*/ fun <init>(): test.Outer
internal final class test.Outer.Inner2 : test.Outer.Inner1 {
public final /*constructor*/ fun <init>(): test.Outer.Inner2
}
}
compiler/testData/readKotlinBinaryClass/classFun/ClassInParamUsedInFun.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ClassParamUsedInFun</*0*/ in T : jet.Any?> : jet.Any {
internal final fun f(/*0*/ t: T): jet.Int
public final /*constructor*/ fun </*0*/ in T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
internal final fun f(/*0*/ t: T): jet.Int
}
compiler/testData/readKotlinBinaryClass/classFun/ClassParamUsedInFun.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ClassParamUsedInFun</*0*/ T : jet.Any?> : jet.Any {
internal final fun f(/*0*/ t: T): jet.Int
public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ClassParamUsedInFun<T>
internal final fun f(/*0*/ t: T): jet.Int
}
compiler/testData/readKotlinBinaryClass/classFun/FunDelegationToTraitImpl.txt
+1 -1
View File
@@ -4,6 +4,6 @@ internal abstract trait test.A : jet.Any {
internal open fun f(): jet.String
}
internal final class test.B : test.A {
internal open override /*1*/ fun f(): jet.String
public final /*constructor*/ fun <init>(): test.B
internal open override /*1*/ fun f(): jet.String
}
compiler/testData/readKotlinBinaryClass/classFun/FunInParamSuper.txt
+2 -2
View File
@@ -1,10 +1,10 @@
namespace test
internal open class test.Base</*0*/ T : jet.Any?> : jet.Any {
internal final fun foo(): T
public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.Base<T>
internal final fun foo(): T
}
internal final class test.Inh : test.Base<jet.String> {
internal final override /*1*/ fun foo(): jet.String
public final /*constructor*/ fun <init>(): test.Inh
internal final override /*1*/ fun foo(): jet.String
}
compiler/testData/readKotlinBinaryClass/constructor/ConstructorCollectionParameter.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.TestingKotlinCollections : jet.Any {
internal final val arguments: java.util.Collection<jet.String>
public final /*constructor*/ fun <init>(/*0*/ arguments: java.util.Collection<jet.String>): test.TestingKotlinCollections
internal final val arguments: java.util.Collection<jet.String>
}
compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFun.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.River : jet.Any {
internal final fun song(): jet.Int
public final /*constructor*/ fun <init>(): test.River
internal final fun song(): jet.Int
}
compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFoo.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ClassFunGetFoo : jet.Any {
internal final fun getFoo(): jet.Int
public final /*constructor*/ fun <init>(): test.ClassFunGetFoo
internal final fun getFoo(): jet.Int
}
compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunGetFooSetFoo.txt
+1 -1
View File
@@ -1,7 +1,7 @@
namespace test
internal final class test.ClassFunGetFoo : jet.Any {
public final /*constructor*/ fun <init>(): test.ClassFunGetFoo
internal final fun getFoo(): jet.Int
internal final fun setFoo(/*0*/ p: jet.Int): jet.Tuple0
public final /*constructor*/ fun <init>(): test.ClassFunGetFoo
}
compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ClassFunSetFoo.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ClassFunGetFoo : jet.Any {
internal final fun set(/*0*/ p: jet.Int): jet.Tuple0
public final /*constructor*/ fun <init>(): test.ClassFunGetFoo
internal final fun set(/*0*/ p: jet.Int): jet.Tuple0
}
compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ExtFunInClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ExtFunInClass : jet.Any {
internal final fun jet.Int.shuffle(): jet.Int
public final /*constructor*/ fun <init>(): test.ExtFunInClass
internal final fun jet.Int.shuffle(): jet.Int
}
compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierAbstract.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal abstract class test.ModifierAbstract : jet.Any {
internal abstract fun abs(): jet.Int
public final /*constructor*/ fun <init>(): test.ModifierAbstract
internal abstract fun abs(): jet.Int
}
compiler/testData/readKotlinBinaryClass/fun/nonGeneric/ModifierOpen.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal open class test.ModifierOpen : jet.Any {
internal open fun abs(): jet.Int
public final /*constructor*/ fun <init>(): test.ModifierOpen
internal open fun abs(): jet.Int
}
compiler/testData/readKotlinBinaryClass/prop/ClassVal.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ClassVal : jet.Any {
internal final val aa: jet.Int
public final /*constructor*/ fun <init>(): test.ClassVal
internal final val aa: jet.Int
}
compiler/testData/readKotlinBinaryClass/prop/ClassValAbstract.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal abstract class test.ClassValAbstract : jet.Any {
internal abstract val a: jet.Int
public final /*constructor*/ fun <init>(): test.ClassValAbstract
internal abstract val a: jet.Int
}
compiler/testData/readKotlinBinaryClass/prop/ClassVar.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ClassVar : jet.Any {
internal final var aa: jet.Int
public final /*constructor*/ fun <init>(): test.ClassVar
internal final var aa: jet.Int
}
compiler/testData/readKotlinBinaryClass/prop/ExtValInClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ExtPropInClass : jet.Any {
internal final val jet.Int.itIs: jet.Int
public final /*constructor*/ fun <init>(): test.ExtPropInClass
internal final val jet.Int.itIs: jet.Int
}
compiler/testData/readKotlinBinaryClass/prop/ExtValIntListQOfIntInClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ExtValInClass : jet.Any {
internal final val jet.Int.asas: java.util.List<jet.Int>?
public final /*constructor*/ fun <init>(): test.ExtValInClass
internal final val jet.Int.asas: java.util.List<jet.Int>?
}
compiler/testData/readKotlinBinaryClass/prop/ExtValIntTInClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ExtValInClass</*0*/ T : jet.Any?> : jet.Any {
internal final val jet.Int.asas: T
public final /*constructor*/ fun </*0*/ T : jet.Any?><init>(): test.ExtValInClass<T>
internal final val jet.Int.asas: T
}
compiler/testData/readKotlinBinaryClass/prop/ExtValIntTQInClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
internal final val jet.Int.asas: P?
public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
internal final val jet.Int.asas: P?
}
compiler/testData/readKotlinBinaryClass/prop/ExtValTIntInClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
internal final val P.asas: jet.Int
public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
internal final val P.asas: jet.Int
}
compiler/testData/readKotlinBinaryClass/prop/ExtVarInClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ExtPropInClass : jet.Any {
internal final var jet.Int.itIs: jet.Int
public final /*constructor*/ fun <init>(): test.ExtPropInClass
internal final var jet.Int.itIs: jet.Int
}
compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTInClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
internal final var jet.Int.asas: P
public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
internal final var jet.Int.asas: P
}
compiler/testData/readKotlinBinaryClass/prop/ExtVarIntTQInClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ExtValInClass</*0*/ P : jet.Any?> : jet.Any {
internal final var jet.Int.asas: P?
public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValInClass<P>
internal final var jet.Int.asas: P?
}
compiler/testData/readKotlinBinaryClass/prop/ExtVarTIntInClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
internal final var P.asas: jet.Int
public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
internal final var P.asas: jet.Int
}
compiler/testData/readKotlinBinaryClass/prop/ExtVarTQIntInClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.ExtValPIntInClass</*0*/ P : jet.Any?> : jet.Any {
internal final var P?.asas: jet.Int
public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ExtValPIntInClass<P>
internal final var P?.asas: jet.Int
}
compiler/testData/readKotlinBinaryClass/prop/ExtVarl.txt
+1 -1
View File
@@ -1,4 +1,4 @@
namespace test
internal final val jet.String.junk: jet.Int
internal final var jet.Int.junk: jet.Short
internal final val jet.String.junk: jet.Int
compiler/testData/readKotlinBinaryClass/prop/OverrideClassVal.txt
+2 -2
View File
@@ -1,10 +1,10 @@
namespace test
internal open class test.BaseClass : jet.Any {
internal open val shape: jet.String
public final /*constructor*/ fun <init>(): test.BaseClass
internal open val shape: jet.String
}
internal open class test.Subclass : test.BaseClass {
internal open override /*1*/ val shape: jet.String
public final /*constructor*/ fun <init>(): test.Subclass
internal open override /*1*/ val shape: jet.String
}
compiler/testData/readKotlinBinaryClass/prop/OverrideTraitVal.txt
+1 -1
View File
@@ -1,8 +1,8 @@
namespace test
internal open class test.Subclass : test.Trait {
internal open override /*1*/ val shape: jet.String
public final /*constructor*/ fun <init>(): test.Subclass
internal open override /*1*/ val shape: jet.String
}
internal abstract trait test.Trait : jet.Any {
internal abstract val shape: jet.String
compiler/testData/readKotlinBinaryClass/prop/PropFromSuperclass.txt
+2 -2
View File
@@ -1,10 +1,10 @@
namespace test
internal open class test.BaseClass : jet.Any {
internal final val exactly: jet.Int
public final /*constructor*/ fun <init>(): test.BaseClass
internal final val exactly: jet.Int
}
internal final class test.Subclass : test.BaseClass {
internal final override /*1*/ val exactly: jet.Int
public final /*constructor*/ fun <init>(): test.Subclass
internal final override /*1*/ val exactly: jet.Int
}
compiler/testData/readKotlinBinaryClass/prop/VarDelegationToTraitImpl.txt
+1 -1
View File
@@ -4,6 +4,6 @@ internal abstract trait test.A : jet.Any {
internal open var v: jet.String
}
internal final class test.B : test.A {
internal open override /*1*/ var v: jet.String
public final /*constructor*/ fun <init>(): test.B
internal open override /*1*/ var v: jet.String
}
compiler/testData/readKotlinBinaryClass/visibility/InternalAbstractTraitMembersOverridden.txt
+3 -3
View File
@@ -2,12 +2,12 @@ namespace test
internal abstract trait test.A : jet.Any {
internal abstract fun f(): jet.Int
internal abstract val v: jet.Int
public abstract var p: jet.Int
internal abstract val v: jet.Int
}
internal final class test.B : test.A {
internal open override /*1*/ fun f(): jet.Int
internal open override /*1*/ val v: jet.Int
public final /*constructor*/ fun <init>(): test.B
internal open override /*1*/ fun f(): jet.Int
public open override /*1*/ var p: jet.Int
internal open override /*1*/ val v: jet.Int
}
compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembers.txt
+1 -1
View File
@@ -2,6 +2,6 @@ namespace test
internal abstract trait test.A : jet.Any {
internal abstract fun f(): jet.Int
internal abstract val v: jet.Int
public abstract var p: jet.Int internal set
internal abstract val v: jet.Int
}
compiler/testData/readKotlinBinaryClass/visibility/InternalTraitMembersInherited.txt
+3 -3
View File
@@ -2,12 +2,12 @@ namespace test
internal abstract trait test.A : jet.Any {
internal open fun f(): jet.Int
internal open val v: jet.Int
public open var p: jet.Int internal set
internal open val v: jet.Int
}
internal final class test.B : test.A {
internal open override /*1*/ fun f(): jet.Int
internal open override /*1*/ val v: jet.Int
public final /*constructor*/ fun <init>(): test.B
internal open override /*1*/ fun f(): jet.Int
public open override /*1*/ var p: jet.Int internal set
internal open override /*1*/ val v: jet.Int
}