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/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.kt
+2 -2
View File
@@ -1,6 +1,6 @@
class A {
class B {
<!ENUM_NOT_ALLOWED!>enum<!> class E {
inner class B {
enum class <!NESTED_CLASS_NOT_ALLOWED!>E<!> {
ENTRY
}
}
compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt
+2 -2
View File
@@ -3,7 +3,7 @@ class A {
enum class E { ENTRY } // OK
}
class B {
<!ENUM_NOT_ALLOWED!>enum<!> class E { ENTRY }
inner class B {
enum class <!NESTED_CLASS_NOT_ALLOWED!>E<!> { ENTRY }
}
}
compiler/testData/javaDescriptorResolver/staticMembers/Enum_non_static.txt
+5 -5
View File
@@ -12,15 +12,15 @@ public final enum class Enum : jet.Enum<test.Enum> {
public final val C : test.Enum
public final fun valueOf(/*0*/ value : jet.String) : test.Enum
public final fun values() : jet.Array<test.Enum>
public open class Nested : java.lang.Object {
public constructor Nested()
public/*package*/ open fun foo() : Unit
}
}
public open inner class Inner : java.lang.Object {
public constructor Inner()
public/*package*/ open fun bar() : Unit
}
public open class Nested : java.lang.Object {
public constructor Nested()
public/*package*/ open fun foo() : Unit
}
}
compiler/testData/loadKotlinCustom/enum/innerEnumBinary.txt
+9 -13
View File
@@ -3,20 +3,16 @@ package test
internal final class A {
public constructor A()
internal class object <class-object-for-A> {
private constructor <class-object-for-A>()
internal final enum class E : jet.Enum<test.A.E> {
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> {
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> {
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> {
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>
}
}
}
compiler/testData/loadKotlinCustom/enum/innerEnumExistingClassObjectBinary.txt
+11 -11
View File
@@ -5,18 +5,18 @@ internal final class A {
internal class object <class-object-for-A> {
private constructor <class-object-for-A>()
}
internal final enum class E : jet.Enum<test.A.E> {
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> {
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> {
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> {
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>
}
}
}
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
}
}
}
compiler/testData/loadKotlinCustom/enum/innerEnumSource.txt
+13 -17
View File
@@ -3,25 +3,21 @@ package test
internal final class A {
/*primary*/ public constructor A()
public 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
}
}
}