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

Fix modifier order in generated overriden functions

Browse Source 
Fixes #KT-21600
This commit is contained in:
Kirill Rakhman
2018-01-09 18:45:30 +01:00
committed by Alexander Udalov
parent 99be75cbfc
commit 8bc020f31b
56 changed files with 137 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.txt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@ package
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit
public inline fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: U, l: V) -> W): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).get(/*0*/ index: kotlin.Int): kotlin.Unit
public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).get(/*0*/ index: kotlin.Int): kotlin.Unit
public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).get(/*0*/ index: kotlin.Int): kotlin.Unit
public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).get(/*0*/ index: kotlin.Int): kotlin.Unit
compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.txt
Vendored
+4 -4
View File
@@ -3,7 +3,7 @@ package
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U, /*1*/ ext: T.(p: U) -> V): kotlin.Unit
public operator fun </*0*/ T, /*1*/ U> ((T) -> U).minusAssign(/*0*/ p: (T) -> U): kotlin.Unit
public operator fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).minusAssign(/*0*/ ext: T.(U) -> V): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).modAssign(/*0*/ p: (T) -> U): () -> kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).modAssign(/*0*/ ext: T.(U) -> V): () -> kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).plusAssign(/*0*/ p: (T) -> U): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).plusAssign(/*0*/ ext: T.(U) -> V): kotlin.Unit
public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).modAssign(/*0*/ p: (T) -> U): () -> kotlin.Unit
public inline operator fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).modAssign(/*0*/ ext: T.(U) -> V): () -> kotlin.Unit
public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).plusAssign(/*0*/ p: (T) -> U): kotlin.Unit
public inline operator fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).plusAssign(/*0*/ ext: T.(U) -> V): kotlin.Unit
compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.txt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@ package
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit
public inline fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: U, l: V) -> W): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).compareTo(/*0*/ p: (T) -> U): kotlin.Int
public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).compareTo(/*0*/ p: (T) -> U): kotlin.Int
public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).compareTo(/*0*/ index: (T, U) -> V): kotlin.Int
public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).compareTo(/*0*/ index: T.(U, V) -> W): kotlin.Int
compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.txt
Vendored
+2 -2
View File
@@ -2,9 +2,9 @@ package
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit
public inline fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: U, l: V) -> W): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).component1(): kotlin.Int
public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).component1(): kotlin.Int
public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).component1(): kotlin.Int
public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).component1(): kotlin.Int
public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).component2(): kotlin.Int
public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).component2(): kotlin.Int
public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).component2(): kotlin.Int
public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).component2(): kotlin.Int
compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.txt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@ package
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> U, /*1*/ ext: T.(p: U, l: U) -> V): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).contains(/*0*/ p: (T) -> U): kotlin.Boolean
public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).contains(/*0*/ p: (T) -> U): kotlin.Boolean
public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).contains(/*0*/ p: (T, U) -> V): kotlin.Boolean
public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).contains(/*0*/ ext: T.(U, V) -> W): kotlin.Boolean
compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.txt
Vendored
+2 -2
View File
@@ -4,7 +4,7 @@ public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U, /*1*/ ext: T.(p: U) -> V): kotlin.Unit
public operator fun </*0*/ T, /*1*/ U> ((T) -> U).minus(/*0*/ p: (T) -> U): kotlin.Unit
public operator fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).minus(/*0*/ p: T.(p: U) -> V): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).plus(/*0*/ p: (T) -> U): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).plus(/*0*/ p: T.(p: U) -> V): kotlin.Unit
public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).plus(/*0*/ p: (T) -> U): kotlin.Unit
public inline operator fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).plus(/*0*/ p: T.(p: U) -> V): kotlin.Unit
public inline fun </*0*/ T, /*1*/ U> ((T) -> U).submit(): kotlin.Unit
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> (T.(U) -> V).submit(): kotlin.Unit
compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@ package
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> U): kotlin.Unit
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> U, /*1*/ ext: T.(p: U, l: U) -> V): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).rangeTo(/*0*/ p: (T) -> U): kotlin.ranges.ClosedRange<kotlin.Int>
public inline operator fun </*0*/ T, /*1*/ U> ((T) -> U).rangeTo(/*0*/ p: (T) -> U): kotlin.ranges.ClosedRange<kotlin.Int>
public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).rangeTo(/*0*/ p: (T, U) -> V): kotlin.ranges.ClosedRange<kotlin.Int>
public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).rangeTo(/*0*/ ext: T.(U, V) -> W): kotlin.ranges.ClosedRange<kotlin.Int>