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

FIR: introduce & use various comparators to sort members while de/serialization

Browse Source 
#KT-41018 fixed
This commit is contained in:
Jinseong Jeon
2020-08-13 23:17:30 -07:00
committed by Mikhail Zarechenskiy
parent 91c021c699
commit e8157a5488
81 changed files with 1106 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt
Vendored
+6 -6
View File
@@ -1,26 +1,26 @@
public final class A : R|kotlin/Any| {
public constructor(): R|test/A|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/A.Companion|
public final annotation class Anno1 : R|kotlin/Annotation| {
public constructor(): R|test/A.Companion.Anno1|
}
public final class B : R|kotlin/Any| {
public constructor(): R|test/A.Companion.B|
public final annotation class Anno2 : R|kotlin/Annotation| {
public constructor(): R|test/A.Companion.B.Anno2|
}
public constructor(): R|test/A.Companion.B|
}
private constructor(): R|test/A.Companion|
}
public constructor(): R|test/A|
}
@R|test/A.Companion.Anno1|() @R|test/A.Companion.B.Anno2|() public final class C : R|kotlin/Any| {
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt
Vendored
+4 -4
View File
@@ -4,16 +4,16 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Class.Companion|
@R|test/Anno|() public final class Nested : R|kotlin/Any| {
public constructor(): R|test/Class.Companion.Nested|
}
private constructor(): R|test/Class.Companion|
}
public constructor(): R|test/Class|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt
Vendored
+2 -2
View File
@@ -4,11 +4,11 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
@R|test/Anno|() public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Class.Companion|
}
public constructor(): R|test/Class|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
Vendored
+4 -4
View File
@@ -1,9 +1,5 @@
public final class A : R|kotlin/Any| {
public constructor(): R|test/A|
public final class B : R|kotlin/Any| {
public constructor(): R|test/A.B|
public final companion object Companion : R|kotlin/Any| {
public final val TEST: R|kotlin/Int|
public get(): R|kotlin/Int|
@@ -12,6 +8,10 @@ public final class A : R|kotlin/Any| {
}
public constructor(): R|test/A.B|
}
public constructor(): R|test/A|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt
Vendored
+2 -2
View File
@@ -1,6 +1,4 @@
@R|kotlin/Deprecated|(message = String(Class)) public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
@R|kotlin/Deprecated|(message = String(companion object)) public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Class.Companion|
@@ -16,4 +14,6 @@
}
public constructor(): R|test/Class|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
Vendored
+2 -2
View File
@@ -7,8 +7,6 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
@R|test/Anno|(t = R|java/lang/annotation/ElementType.METHOD|()) public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
@R|test/Anno|(t = R|java/lang/annotation/ElementType.ANNOTATION_TYPE|()) public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Class.Companion|
@@ -24,4 +22,6 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public constructor(): R|test/Class|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
public final class A : R|kotlin/Any| {
public constructor(): R|test/A|
public final annotation class Anno : R|kotlin/Annotation| {
public constructor(): R|test/A.Anno|
}
public constructor(): R|test/A|
}
@R|test/A.Anno|() public final class B : R|kotlin/Any| {
compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt
Vendored
+2 -2
View File
@@ -4,8 +4,6 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
@R|test/Anno|() public final inner class Inner : R|kotlin/Any| {
public constructor(): R|test/Class.Inner|
@@ -16,4 +14,6 @@ public final class Class : R|kotlin/Any| {
}
public constructor(): R|test/Class|
}