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

Remove 'inner enum' hack & fix Java inner class resolve

Browse Source 
Inner enum was placed into the class object of the outer class. Remove the
hack from frontend, frontend.java & backend. Fix tests

 #KT-1174 In Progress
This commit is contained in:
Alexander Udalov
2012-12-04 20:07:13 +04:00
parent cc6bd6239a
commit b612989eb0
19 changed files with 70 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectSource.txt
+15 -15
View File
@@ -5,23 +5,23 @@ internal final class A {
internal class object <class-object-for-A> {
/*primary*/ private constructor <class-object-for-A>()
}
internal final enum class E : jet.Enum<test.A.E> {
/*primary*/ private constructor E()
public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
internal final enum class E : jet.Enum<test.A.E> {
/*primary*/ private constructor E()
public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
internal class object <class-object-for-E> {
/*primary*/ private constructor <class-object-for-E>()
public final val ENTRY : test.A.E
public final fun valueOf(/*0*/ value : jet.String) : test.A.E
public final fun values() : jet.Array<test.A.E>
internal class object <class-object-for-E> {
/*primary*/ private constructor <class-object-for-E>()
public final val ENTRY : test.A.E
public final fun valueOf(/*0*/ value : jet.String) : test.A.E
public final fun values() : jet.Array<test.A.E>
private enum entry ENTRY : test.A.E {
/*primary*/ private constructor ENTRY()
public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
}
private enum entry ENTRY : test.A.E {
/*primary*/ private constructor ENTRY()
public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
}
}
}