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/classObject/ClassObjectDeclaresVal.txt
Vendored
+2 -2
View File
@@ -1,6 +1,4 @@
public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
public constructor(): R|test/ClassObjectDeclaresProperty|
public final companion object Companion : R|kotlin/Any| {
public final val i: R|kotlin/Int|
public get(): R|kotlin/Int|
@@ -9,4 +7,6 @@ public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
}
public constructor(): R|test/ClassObjectDeclaresProperty|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
Vendored
+2 -2
View File
@@ -1,6 +1,4 @@
public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
public constructor(): R|test/ClassObjectDeclaresProperty|
public final companion object Companion : R|kotlin/Any| {
public final var s: R|kotlin/String|
public get(): R|kotlin/String|
@@ -10,4 +8,6 @@ public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
}
public constructor(): R|test/ClassObjectDeclaresProperty|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt
Vendored
+16 -16
View File
@@ -1,75 +1,75 @@
public final class Int : R|kotlin/Any| {
public constructor(): R|test/Int|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Int.Companion|
}
public constructor(): R|test/Int|
}
public final class Outer : R|kotlin/Any| {
public constructor(): R|test/Outer|
public final class Int : R|kotlin/Any| {
public constructor(): R|test/Outer.Int|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Outer.Int.Companion|
}
public constructor(): R|test/Outer.Int|
}
private final class Pri : R|kotlin/Any| {
public constructor(): R|test/Outer.Pri|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Outer.Pri.Companion|
}
public constructor(): R|test/Outer.Pri|
}
protected final class Pro : R|kotlin/Any| {
public constructor(): R|test/Outer.Pro|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Outer.Pro.Companion|
}
public constructor(): R|test/Outer.Pro|
}
public final class Pub : R|kotlin/Any| {
public constructor(): R|test/Outer.Pub|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Outer.Pub.Companion|
}
public constructor(): R|test/Outer.Pub|
}
public constructor(): R|test/Outer|
}
private final class Pri : R|kotlin/Any| {
public constructor(): R|test/Pri|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Pri.Companion|
}
public constructor(): R|test/Pri|
}
public final class Pub : R|kotlin/Any| {
public constructor(): R|test/Pub|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Pub.Companion|
}
public constructor(): R|test/Pub|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt
Vendored
+18 -18
View File
@@ -1,90 +1,90 @@
internal final class IntInt : R|kotlin/Any| {
public constructor(): R|test/IntInt|
internal final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/IntInt.Companion|
}
public constructor(): R|test/IntInt|
}
internal final class IntPri : R|kotlin/Any| {
public constructor(): R|test/IntPri|
private final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/IntPri.Companion|
}
public constructor(): R|test/IntPri|
}
internal final class IntPub : R|kotlin/Any| {
public constructor(): R|test/IntPub|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/IntPub.Companion|
}
public constructor(): R|test/IntPub|
}
private final class PriInt : R|kotlin/Any| {
public constructor(): R|test/PriInt|
internal final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/PriInt.Companion|
}
public constructor(): R|test/PriInt|
}
private final class PriPri : R|kotlin/Any| {
public constructor(): R|test/PriPri|
private final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/PriPri.Companion|
}
public constructor(): R|test/PriPri|
}
private final class PriPub : R|kotlin/Any| {
public constructor(): R|test/PriPub|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/PriPub.Companion|
}
public constructor(): R|test/PriPub|
}
public final class PubInt : R|kotlin/Any| {
public constructor(): R|test/PubInt|
internal final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/PubInt.Companion|
}
public constructor(): R|test/PubInt|
}
public final class PubPri : R|kotlin/Any| {
public constructor(): R|test/PubPri|
private final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/PubPri.Companion|
}
public constructor(): R|test/PubPri|
}
public final class PubPub : R|kotlin/Any| {
public constructor(): R|test/PubPub|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/PubPub.Companion|
}
public constructor(): R|test/PubPub|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt
Vendored
+2 -2
View File
@@ -2,11 +2,11 @@ public abstract interface Bbb : R|kotlin/Any| {
}
public final class ClassObjectextendsTrait : R|kotlin/Any| {
public constructor(): R|test/ClassObjectextendsTrait|
public final companion object Companion : R|test/Bbb| {
private constructor(): R|test/ClassObjectextendsTrait.Companion|
}
public constructor(): R|test/ClassObjectextendsTrait|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
Vendored
+2 -2
View File
@@ -2,11 +2,11 @@ public abstract interface Bbb<P> : R|kotlin/Any| {
}
public final class ClassObjectExtendsTraitWithTP : R|kotlin/Any| {
public constructor(): R|test/ClassObjectExtendsTraitWithTP|
public final companion object Companion : R|test/Bbb<kotlin/String>| {
private constructor(): R|test/ClassObjectExtendsTraitWithTP.Companion|
}
public constructor(): R|test/ClassObjectExtendsTraitWithTP|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
Vendored
+2 -2
View File
@@ -1,6 +1,4 @@
public final class Test : R|kotlin/Any| {
public constructor(): R|test/Test|
public final companion object Companion : R|kotlin/Any| {
public final fun incProp4(): R|kotlin/Unit|
@@ -33,4 +31,6 @@ public final class Test : R|kotlin/Any| {
}
public constructor(): R|test/Test|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
Vendored
+5 -5
View File
@@ -1,9 +1,4 @@
public final class A : R|kotlin/Any| {
public final val other: R|kotlin/Int|
public get(): R|kotlin/Int|
public constructor(): R|test/A|
public final companion object Companion : R|kotlin/Any| {
public final val some: R|kotlin/Int|
public get(): R|kotlin/Int|
@@ -12,4 +7,9 @@ public final class A : R|kotlin/Any| {
}
public final val other: R|kotlin/Int|
public get(): R|kotlin/Int|
public constructor(): R|test/A|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/Delegation.txt
Vendored
+4 -4
View File
@@ -1,8 +1,4 @@
public final class A : R|test/T| {
public open fun foo(): R|kotlin/Int|
public constructor(): R|test/A|
public final companion object Companion : R|test/T| {
public open fun foo(): R|kotlin/Int|
@@ -10,6 +6,10 @@ public final class A : R|test/T| {
}
public open fun foo(): R|kotlin/Int|
public constructor(): R|test/A|
}
public abstract interface T : R|kotlin/Any| {
compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt
Vendored
+2 -2
View File
@@ -1,6 +1,4 @@
public final class TestFirst : R|kotlin/Any| {
public constructor(): R|test/TestFirst|
public final companion object Companion : R|kotlin/Any| {
public final fun testing(a: R|test/TestFirst.InnerClass|): R|kotlin/Int|
@@ -20,4 +18,6 @@ public final class TestFirst : R|kotlin/Any| {
}
public constructor(): R|test/TestFirst|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/NamedClassObject.txt
Vendored
+2 -2
View File
@@ -1,6 +1,4 @@
public final class NamedClassObject : R|kotlin/Any| {
public constructor(): R|test/NamedClassObject|
public final companion object Named : R|kotlin/Any| {
public final fun f(): R|kotlin/Int|
@@ -8,4 +6,6 @@ public final class NamedClassObject : R|kotlin/Any| {
}
public constructor(): R|test/NamedClassObject|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
public final class SimpleClassObject : R|kotlin/Any| {
public constructor(): R|test/SimpleClassObject|
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/SimpleClassObject.Companion|
}
public constructor(): R|test/SimpleClassObject|
}