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

[FIR] Start enum entries reworking

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-11-28 18:07:29 +03:00
committed by Mikhail Glukhikh
parent 68d64f1b5c
commit 13132e69a3
60 changed files with 443 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
Vendored
+4 -1
View File
@@ -6,9 +6,11 @@
public final enum class E : R|kotlin/Enum<test/E>| {
private constructor(): R|test/E|
public? final enum entry ENTRY : R|test/E| {
public final static val ENTRY: R|test/E| = object : R|test/E| {
}
}
public final annotation class EnumOption : R|kotlin/Annotation| {
@@ -37,3 +39,4 @@ public final annotation class StringOptions : R|kotlin/Annotation| {
public constructor(vararg option: R|kotlin/Array<out kotlin/String>|): R|test/StringOptions|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt
Vendored
+4 -1
View File
@@ -1,9 +1,11 @@
public final enum class E : R|kotlin/Enum<test/E>| {
private constructor(): R|test/E|
public? final enum entry CAKE : R|test/E| {
public final static val CAKE: R|test/E| = object : R|test/E| {
}
}
public final annotation class EnumAnno : R|kotlin/Annotation| {
@@ -28,3 +30,4 @@ public final annotation class EnumArrayAnno : R|kotlin/Annotation| {
public constructor(vararg value: R|kotlin/Array<out test/E>|): R|test/EnumArrayAnno|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt
Vendored
+12 -4
View File
@@ -17,17 +17,25 @@ public final annotation class Bnno : R|kotlin/Annotation| {
public final enum class Eee : R|kotlin/Enum<test/Eee>| {
private constructor(): R|test/Eee|
public? final enum entry Entry1 : R|test/Eee| {
public final static val Entry1: R|test/Eee| = object : R|test/Eee| {
}
public? final enum entry Entry2 : R|test/Eee| {
public final static val Entry2: R|test/Eee| = object : R|test/Eee| {
}
public? final enum entry Entry3 : R|test/Eee| {
public final static val Entry3: R|test/Eee| = object : R|test/Eee| {
}
public? final enum entry Entry4 : R|test/Eee| {
public final static val Entry4: R|test/Eee| = object : R|test/Eee| {
}
}
compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumVisibility.txt
Vendored
+9 -3
View File
@@ -1,24 +1,30 @@
internal final enum class In : R|kotlin/Enum<test/In>| {
private constructor(): R|test/In|
public? final enum entry A : R|test/In| {
public final static val A: R|test/In| = object : R|test/In| {
}
}
private final enum class Pr : R|kotlin/Enum<test/Pr>| {
private constructor(): R|test/Pr|
public? final enum entry A : R|test/Pr| {
public final static val A: R|test/Pr| = object : R|test/Pr| {
}
}
public final enum class Pu : R|kotlin/Enum<test/Pu>| {
private constructor(): R|test/Pu|
public? final enum entry A : R|test/Pu| {
public final static val A: R|test/Pu| = object : R|test/Pu| {
}
}
compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt
Vendored
+9 -3
View File
@@ -7,14 +7,20 @@ public final enum class En : R|kotlin/Enum<test/En>| {
private constructor(b: R|kotlin/Boolean| = STUB, i: R|kotlin/Int| = STUB): R|test/En|
public? final enum entry E1 : R|test/En| {
public final static val E1: R|test/En| = object : R|test/En| {
}
public? final enum entry E2 : R|test/En| {
public final static val E2: R|test/En| = object : R|test/En| {
}
public? final enum entry E3 : R|test/En| {
public final static val E3: R|test/En| = object : R|test/En| {
}
}
compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt
Vendored
+6 -2
View File
@@ -19,11 +19,15 @@ public final enum class Enum : R|kotlin/Enum<test/Enum>| {
public abstract interface Trait : R|kotlin/Any| {
}
public? final enum entry ENTRY1 : R|test/Enum| {
public final static val ENTRY1: R|test/Enum| = object : R|test/Enum| {
}
public? final enum entry ENTRY2 : R|test/Enum| {
public final static val ENTRY2: R|test/Enum| = object : R|test/Enum| {
}
}
compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnum.txt
Vendored
+3 -1
View File
@@ -4,9 +4,11 @@ public final class A : R|kotlin/Any| {
public final enum class E : R|kotlin/Enum<test/A.E>| {
private constructor(): R|test/A.E|
public? final enum entry ENTRY : R|test/A.E| {
public final static val ENTRY: R|test/A.E| = object : R|test/A.E| {
}
}
}
compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt
Vendored
+3 -1
View File
@@ -9,9 +9,11 @@ public final class A : R|kotlin/Any| {
public final enum class E : R|kotlin/Enum<test/A.E>| {
private constructor(): R|test/A.E|
public? final enum entry ENTRY : R|test/A.E| {
public final static val ENTRY: R|test/A.E| = object : R|test/A.E| {
}
}
}
compiler/fir/resolve/testData/loadCompiledKotlin/enum/SimpleEnum.txt
Vendored
+3 -1
View File
@@ -1,8 +1,10 @@
public final enum class MyEnum : R|kotlin/Enum<test/MyEnum>| {
private constructor(): R|test/MyEnum|
public? final enum entry ENTRY : R|test/MyEnum| {
public final static val ENTRY: R|test/MyEnum| = object : R|test/MyEnum| {
}
}
compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Enum.txt
Vendored
+6 -2
View File
@@ -1,11 +1,15 @@
public final enum class Test : R|kotlin/Enum<test/Test>| {
private constructor(a: R|kotlin/Int|): R|test/Test|
public? final enum entry A : R|test/Test| {
public final static val A: R|test/Test| = object : R|test/Test| {
}
public? final enum entry B : R|test/Test| {
public final static val B: R|test/Test| = object : R|test/Test| {
}
}
compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt
Vendored
+24 -8
View File
@@ -1,29 +1,45 @@
public final enum class E : R|kotlin/Enum<test/E>| {
private constructor(): R|test/E|
public? final enum entry ONE : R|test/E| {
public final static val ONE: R|test/E| = object : R|test/E| {
}
public? final enum entry TWO : R|test/E| {
public final static val TWO: R|test/E| = object : R|test/E| {
}
public? final enum entry THREE : R|test/E| {
public final static val THREE: R|test/E| = object : R|test/E| {
}
public? final enum entry FOUR : R|test/E| {
public final static val FOUR: R|test/E| = object : R|test/E| {
}
public? final enum entry FIVE : R|test/E| {
public final static val FIVE: R|test/E| = object : R|test/E| {
}
public? final enum entry SIX : R|test/E| {
public final static val SIX: R|test/E| = object : R|test/E| {
}
public? final enum entry SEVEN : R|test/E| {
public final static val SEVEN: R|test/E| = object : R|test/E| {
}
public? final enum entry EIGHT : R|test/E| {
public final static val EIGHT: R|test/E| = object : R|test/E| {
}
}