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

Introduce ClassKind#CLASS_OBJECT and ClassKind#isObject and usages.

Browse Source 
Rename LazyClassDescriptor#onlyEnumEntries -> enumClassObjectInfo.
Determine ClassKind in JetClassInfo and JetObjectInfo constructor.
Remove complex constructor for enum entry in enum test.
Logic simplified in LazyClassMemberScope.
Minor refactorings.
This commit is contained in:
Pavel V. Talanov
2012-08-27 14:21:53 +04:00
parent b228fd66e0
commit 6132946ced
25 changed files with 130 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/lazyResolve/namespaceComparator/enum.kt
+1 -2
View File
@@ -2,6 +2,5 @@ package test
enum class Test(a : Int) {
A : Test(0)
B(x : Int) : Test(x)
C : Test(0) {}
B : Test(0) {}
}
compiler/testData/lazyResolve/namespaceComparator/enum.txt
+2 -7
View File
@@ -7,19 +7,14 @@ internal final enum class test.Test : jet.Enum<test.Test> {
internal final class object test.Test.<class-object-for-Test> {
internal final /*constructor*/ fun <init>(): test.Test.<class-object-for-Test>
internal final val A: test.Test.<class-object-for-Test>.A
internal final val C: test.Test.<class-object-for-Test>.C
internal final val B: test.Test.<class-object-for-Test>.B
internal final enum entry test.Test.<class-object-for-Test>.A : test.Test {
internal final /*constructor*/ fun <init>(): test.Test.<class-object-for-Test>.A
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
}
internal final enum entry test.Test.<class-object-for-Test>.B : test.Test {
public final /*constructor*/ fun <init>(/*0*/ x: jet.Int): test.Test.<class-object-for-Test>.B
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
}
internal final enum entry test.Test.<class-object-for-Test>.C : test.Test {
internal final /*constructor*/ fun <init>(): test.Test.<class-object-for-Test>.C
internal final /*constructor*/ fun <init>(): test.Test.<class-object-for-Test>.B
public final override /*1*/ fun name(): jet.String
public final override /*1*/ fun ordinal(): jet.Int
}