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

NamespaceComparator now serializes kind, if it's not DECLARATION.

Browse Source 
Lots of test data changed to include members' kinds.
This commit is contained in:
Alexander Udalov
2012-09-06 18:43:28 +04:00
parent cb13995057
commit c0dc1e6742
23 changed files with 177 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadKotlin/classFun/FunDelegationToTraitImpl.txt
+1 -1
View File
@@ -5,5 +5,5 @@ internal abstract trait test.A : jet.Any {
}
internal final class test.B : test.A {
public final /*constructor*/ fun <init>(): test.B
internal open override /*1*/ fun f(): jet.String
internal open override /*1*/ /*fake_override*/ fun f(): jet.String
}
compiler/testData/loadKotlin/classFun/FunInParamSuper.txt
+1 -1
View File
@@ -6,5 +6,5 @@ internal open class test.Base</*0*/ T : jet.Any?> : jet.Any {
}
internal final class test.Inh : test.Base<jet.String> {
public final /*constructor*/ fun <init>(): test.Inh
internal final override /*1*/ fun foo(): jet.String
internal final override /*1*/ /*fake_override*/ fun foo(): jet.String
}
compiler/testData/loadKotlin/dataClass/MixedComponents.txt
+2 -2
View File
@@ -2,8 +2,8 @@ namespace test
jet.data() internal final class test.DataClass : jet.Any {
public final /*constructor*/ fun <init>(/*0*/ x: jet.String, /*1*/ y: jet.Int, /*2*/ z: jet.Double): test.DataClass
internal final fun component1(): jet.String
internal final fun component2(): jet.Double
internal final /*synthesized*/ fun component1(): jet.String
internal final /*synthesized*/ fun component2(): jet.Double
internal final var x: jet.String
internal final val z: jet.Double
}
compiler/testData/loadKotlin/dataClass/OneVal.txt
+1 -1
View File
@@ -2,6 +2,6 @@ namespace test
jet.data() internal final class test.DataClass : jet.Any {
public final /*constructor*/ fun <init>(/*0*/ x: jet.String): test.DataClass
internal final fun component1(): jet.String
internal final /*synthesized*/ fun component1(): jet.String
internal final val x: jet.String
}
compiler/testData/loadKotlin/dataClass/OpenDataClass.txt
+1 -1
View File
@@ -2,6 +2,6 @@ namespace test
jet.data() internal open class test.DataClass : jet.Any {
public final /*constructor*/ fun <init>(/*0*/ x: jet.String): test.DataClass
internal final fun component1(): jet.String
internal final /*synthesized*/ fun component1(): jet.String
internal final val x: jet.String
}
compiler/testData/loadKotlin/dataClass/OpenPropertyFinalComponent.txt
+1 -1
View File
@@ -2,6 +2,6 @@ namespace test
jet.data() internal open class test.DataClass : jet.Any {
public final /*constructor*/ fun <init>(/*0*/ x: jet.String): test.DataClass
internal final fun component1(): jet.String
internal final /*synthesized*/ fun component1(): jet.String
internal open val x: jet.String
}
compiler/testData/loadKotlin/dataClass/TwoVals.txt
+2 -2
View File
@@ -2,8 +2,8 @@ namespace test
jet.data() internal final class test.DataClass : jet.Any {
public final /*constructor*/ fun <init>(/*0*/ x: jet.String, /*1*/ y: jet.Int): test.DataClass
internal final fun component1(): jet.String
internal final fun component2(): jet.Int
internal final /*synthesized*/ fun component1(): jet.String
internal final /*synthesized*/ fun component2(): jet.Int
internal final val x: jet.String
internal final val y: jet.Int
}
compiler/testData/loadKotlin/dataClass/TwoVars.txt
+2 -2
View File
@@ -2,8 +2,8 @@ namespace test
jet.data() internal final class test.DataClass : jet.Any {
public final /*constructor*/ fun <init>(/*0*/ x: jet.String, /*1*/ y: jet.Int): test.DataClass
internal final fun component1(): jet.String
internal final fun component2(): jet.Int
internal final /*synthesized*/ fun component1(): jet.String
internal final /*synthesized*/ fun component2(): jet.Int
internal final var x: jet.String
internal final var y: jet.Int
}
compiler/testData/loadKotlin/prop/PropFromSuperclass.txt
+1 -1
View File
@@ -6,5 +6,5 @@ internal open class test.BaseClass : jet.Any {
}
internal final class test.Subclass : test.BaseClass {
public final /*constructor*/ fun <init>(): test.Subclass
internal final override /*1*/ val exactly: jet.Int
internal final override /*1*/ /*fake_override*/ val exactly: jet.Int
}
compiler/testData/loadKotlin/prop/VarDelegationToTraitImpl.txt
+1 -1
View File
@@ -5,5 +5,5 @@ internal abstract trait test.A : jet.Any {
}
internal final class test.B : test.A {
public final /*constructor*/ fun <init>(): test.B
internal open override /*1*/ var v: jet.String
internal open override /*1*/ /*fake_override*/ var v: jet.String
}
compiler/testData/loadKotlin/visibility/InternalTraitMembersInherited.txt
+3 -3
View File
@@ -7,7 +7,7 @@ internal abstract trait test.A : jet.Any {
}
internal final class test.B : test.A {
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
internal open override /*1*/ /*fake_override*/ fun f(): jet.Int
public open override /*1*/ /*fake_override*/ var p: jet.Int internal set
internal open override /*1*/ /*fake_override*/ val v: jet.Int
}