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/loadKotlinCustom/enum/enumVisibilityBinary.txt
+6 -6
View File
@@ -2,8 +2,8 @@ namespace test
internal final enum class test.In : jet.Enum<test.In> {
private final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Int): test.In
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
internal final class object test.In.<class-object-for-In> {
private final /*constructor*/ fun <init>(): test.In.<class-object-for-In>
public final val A: test.In
@@ -13,8 +13,8 @@ internal final enum class test.In : jet.Enum<test.In> {
}
private final enum class test.Pr : jet.Enum<test.Pr> {
private final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Int): test.Pr
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
private final class object test.Pr.<class-object-for-Pr> {
private final /*constructor*/ fun <init>(): test.Pr.<class-object-for-Pr>
public final val A: test.Pr
@@ -24,8 +24,8 @@ private final enum class test.Pr : jet.Enum<test.Pr> {
}
public final enum class test.Pu : jet.Enum<test.Pu> {
private final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Int): test.Pu
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
public final class object test.Pu.<class-object-for-Pu> {
private final /*constructor*/ fun <init>(): test.Pu.<class-object-for-Pu>
public final val A: test.Pu
compiler/testData/loadKotlinCustom/enum/enumVisibilitySource.txt
+12 -12
View File
@@ -2,15 +2,15 @@ namespace test
internal final enum class test.In : jet.Enum<test.In> {
private final /*constructor*/ fun <init>(): test.In
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
internal final class object test.In.<class-object-for-In> {
private final /*constructor*/ fun <init>(): test.In.<class-object-for-In>
internal final val A: test.In.<class-object-for-In>.A
internal final enum entry test.In.<class-object-for-In>.A : test.In {
private final /*constructor*/ fun <init>(): test.In.<class-object-for-In>.A
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
}
public final fun valueOf(/*0*/ value: jet.String): test.In
public final fun values(): jet.Array<test.In>
@@ -18,15 +18,15 @@ internal final enum class test.In : jet.Enum<test.In> {
}
private final enum class test.Pr : jet.Enum<test.Pr> {
private final /*constructor*/ fun <init>(): test.Pr
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
private final class object test.Pr.<class-object-for-Pr> {
private final /*constructor*/ fun <init>(): test.Pr.<class-object-for-Pr>
internal final val A: test.Pr.<class-object-for-Pr>.A
internal final enum entry test.Pr.<class-object-for-Pr>.A : test.Pr {
private final /*constructor*/ fun <init>(): test.Pr.<class-object-for-Pr>.A
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
}
public final fun valueOf(/*0*/ value: jet.String): test.Pr
public final fun values(): jet.Array<test.Pr>
@@ -34,15 +34,15 @@ private final enum class test.Pr : jet.Enum<test.Pr> {
}
public final enum class test.Pu : jet.Enum<test.Pu> {
private final /*constructor*/ fun <init>(): test.Pu
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
public final class object test.Pu.<class-object-for-Pu> {
private final /*constructor*/ fun <init>(): test.Pu.<class-object-for-Pu>
internal final val A: test.Pu.<class-object-for-Pu>.A
internal final enum entry test.Pu.<class-object-for-Pu>.A : test.Pu {
private final /*constructor*/ fun <init>(): test.Pu.<class-object-for-Pu>.A
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
}
public final fun valueOf(/*0*/ value: jet.String): test.Pu
public final fun values(): jet.Array<test.Pu>
compiler/testData/loadKotlinCustom/enum/simpleEnumBinary.txt
+2 -2
View File
@@ -2,8 +2,8 @@ namespace test
internal final enum class test.MyEnum : jet.Enum<test.MyEnum> {
private final /*constructor*/ fun <init>(/*0*/ p0: jet.String?, /*1*/ p1: jet.Int): test.MyEnum
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
internal final class object test.MyEnum.<class-object-for-MyEnum> {
private final /*constructor*/ fun <init>(): test.MyEnum.<class-object-for-MyEnum>
public final val ENTRY: test.MyEnum
compiler/testData/loadKotlinCustom/enum/simpleEnumSource.txt
+4 -4
View File
@@ -2,15 +2,15 @@ namespace test
internal final enum class test.MyEnum : jet.Enum<test.MyEnum> {
private final /*constructor*/ fun <init>(): test.MyEnum
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
internal final class object test.MyEnum.<class-object-for-MyEnum> {
private final /*constructor*/ fun <init>(): test.MyEnum.<class-object-for-MyEnum>
internal final val ENTRY: test.MyEnum.<class-object-for-MyEnum>.ENTRY
internal final enum entry test.MyEnum.<class-object-for-MyEnum>.ENTRY : test.MyEnum {
private final /*constructor*/ fun <init>(): test.MyEnum.<class-object-for-MyEnum>.ENTRY
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
}
public final fun valueOf(/*0*/ value: jet.String): test.MyEnum
public final fun values(): jet.Array<test.MyEnum>