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

Minor. Lower type aliase declarations priority

Browse Source 
There are several reasons for doing this:
- See org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberScope.computeDescriptors,
  classifiers are being deserialized in the last turn, so it's necessary to preserve consistent order
- Their priority should be close to classes
This commit is contained in:
Denis Zharkov
2016-08-15 12:28:42 +03:00
parent 5d65951938
commit 257417bc4a
51 changed files with 170 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledKotlin/typealias/Annotations.txt
Vendored
+2 -3
View File
@@ -1,10 +1,9 @@
package test
@test.Ann() public typealias A1 = kotlin.String
@test.Ann(value = "OK") public typealias A2 = kotlin.String
public final annotation class Ann : kotlin.Annotation {
/*primary*/ public constructor Ann(/*0*/ value: kotlin.String = ...)
public final val value: kotlin.String
public final fun <get-value>(): kotlin.String
}
@test.Ann() public typealias A1 = kotlin.String
@test.Ann(value = "OK") public typealias A2 = kotlin.String
compiler/testData/loadJava/compiledKotlin/typealias/Basic.txt
Vendored
+3 -3
View File
@@ -1,8 +1,5 @@
package test
public typealias S = kotlin.String
public typealias SS = test.S
public typealias SSS = test.SS
public val x1: test.S /* = kotlin.String */ = ""
public fun <get-x1>(): test.S /* = kotlin.String */
public val x2: test.SS /* = kotlin.String */ = ""
@@ -15,3 +12,6 @@ public val x5: test.SS? /* = kotlin.String? */ = ""
public fun <get-x5>(): test.SS? /* = kotlin.String? */
public val x6: test.SSS? /* = kotlin.String? */ = ""
public fun <get-x6>(): test.SSS? /* = kotlin.String? */
public typealias S = kotlin.String
public typealias SS = test.S
public typealias SSS = test.SS
compiler/testData/loadJava/compiledKotlin/typealias/Generic.txt
Vendored
+3 -3
View File
@@ -1,11 +1,11 @@
package test
public typealias L</*0*/ T> = kotlin.collections.List<T>
public typealias LL</*0*/ T> = test.L<T>
public typealias LLL</*0*/ T> = test.LL<T>
public fun test1(/*0*/ x: test.L<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */): kotlin.Unit
public fun test2(/*0*/ x: test.LL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */): kotlin.Unit
public fun test3(/*0*/ x: test.LLL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */): kotlin.Unit
public fun test4(/*0*/ x: test.L<test.L<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> /* = kotlin.collections.List<out test.L<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> */): kotlin.Unit
public fun test5(/*0*/ x: test.LL<test.LL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> /* = kotlin.collections.List<out test.LL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> */): kotlin.Unit
public fun test6(/*0*/ x: test.LLL<test.LLL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> /* = kotlin.collections.List<out test.LLL<kotlin.String> /* = kotlin.collections.List<out kotlin.String> */> */): kotlin.Unit
public typealias L</*0*/ T> = kotlin.collections.List<T>
public typealias LL</*0*/ T> = test.L<T>
public typealias LLL</*0*/ T> = test.LL<T>
compiler/testData/loadJava/compiledKotlin/typealias/Nested.txt
Vendored
+3 -3
View File
@@ -1,12 +1,11 @@
package test
public final class Outer</*0*/ X> {
public typealias Test1</*0*/ A> /*captured type parameters: /*1*/ X*/ = test.Pair<X, A>
/*primary*/ public constructor Outer</*0*/ X>()
public final inner class Inner</*0*/ Z> /*captured type parameters: /*1*/ X*/ {
public typealias Test3</*0*/ C> /*captured type parameters: /*1*/ Z, /*2*/ X*/ = test.Triple<X, Z, C>
/*primary*/ public constructor Inner</*0*/ Z>()
public typealias Test3</*0*/ C> /*captured type parameters: /*1*/ Z, /*2*/ X*/ = test.Triple<X, Z, C>
}
public final inner class InnerTest1</*0*/ A> /*captured type parameters: /*1*/ X*/ : test.Pair<X, A> {
@@ -14,9 +13,10 @@ public final class Outer</*0*/ X> {
}
public final class Nested</*0*/ Y> {
public typealias Test2</*0*/ B> /*captured type parameters: /*1*/ Y*/ = test.Pair<Y, B>
/*primary*/ public constructor Nested</*0*/ Y>()
public typealias Test2</*0*/ B> /*captured type parameters: /*1*/ Y*/ = test.Pair<Y, B>
}
public typealias Test1</*0*/ A> /*captured type parameters: /*1*/ X*/ = test.Pair<X, A>
}
public open class Pair</*0*/ T1, /*1*/ T2> {