Fix modifier order in generated overriden functions

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
+1 -1
View File
@@ -5,5 +5,5 @@ public inline fun inlineFunWithInvokeNonInline(/*0*/ noinline s: (p: kotlin.Int)
public inline fun inlineFunWrongExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit
public inline fun testExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit
public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): kotlin.Unit
public infix inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt2(/*0*/ p: kotlin.Int): kotlin.Unit
public inline infix fun ((kotlin.Int) -> kotlin.Unit).inlineExt2(/*0*/ p: kotlin.Int): kotlin.Unit
public infix fun ((kotlin.Int) -> kotlin.Unit).noInlineExt(/*0*/ p: kotlin.Int): kotlin.Unit
@@ -26,7 +26,7 @@ public abstract class Base {
public final class Derived : Base {
public constructor Derived()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final inline override /*1*/ fun foo(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
public final override /*1*/ inline fun foo(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -26,7 +26,7 @@ public abstract class Base {
public final class Derived : Base {
public constructor Derived()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final inline override /*1*/ fun foo(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
public final override /*1*/ inline fun foo(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -4,5 +4,5 @@ public inline fun inlineFunNoInline(/*0*/ noinline s: (p: kotlin.Int) -> kotlin.
public inline fun inlineFunWrongExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit
public inline fun testExtension(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit
public inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt(): kotlin.Unit
public infix inline fun ((kotlin.Int) -> kotlin.Unit).inlineExt2(/*0*/ p: kotlin.Int): kotlin.Unit
public inline infix fun ((kotlin.Int) -> kotlin.Unit).inlineExt2(/*0*/ p: kotlin.Int): kotlin.Unit
public infix fun ((kotlin.Int) -> kotlin.Unit).noInlineExt(/*0*/ p: kotlin.Int): kotlin.Unit
@@ -16,5 +16,5 @@ public final class Derived : Base {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inline override /*1*/ fun withDefault(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
public final override /*1*/ inline fun withDefault(/*0*/ f: () -> kotlin.Unit = ...): kotlin.Unit
}
@@ -8,6 +8,6 @@ public final class Z {
public constructor Z()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final infix inline fun </*0*/ R> inlineFun(/*0*/ crossinline p: () -> R): kotlin.Unit
public final inline infix fun </*0*/ R> inlineFun(/*0*/ crossinline p: () -> R): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -4,20 +4,20 @@ public final class CDerived : IBase {
public constructor CDerived()
public final val anObject: IBase
public final fun aMethod(): kotlin.Unit
public open inline override /*1*/ fun bar(): kotlin.Unit
public open override /*1*/ inline fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final inline override /*1*/ fun foo(): kotlin.Unit
public final override /*1*/ inline fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final inline override /*1*/ fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
public final override /*1*/ inline fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final class CNested : IBase {
public constructor CNested()
public open inline override /*1*/ fun bar(): kotlin.Unit
public open override /*1*/ inline fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final inline override /*1*/ fun foo(): kotlin.Unit
public final override /*1*/ inline fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final inline override /*1*/ fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
public final override /*1*/ inline fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
@@ -26,20 +26,20 @@ public open class COpen : IBase {
public constructor COpen()
public final val anObject: IBase
public final fun aMethod(): kotlin.Unit
public open inline override /*1*/ fun bar(): kotlin.Unit
public open override /*1*/ inline fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final inline override /*1*/ fun foo(): kotlin.Unit
public final override /*1*/ inline fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final inline override /*1*/ fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
public final override /*1*/ inline fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public open class COpenNested : IBase {
public constructor COpenNested()
public open inline override /*1*/ fun bar(): kotlin.Unit
public open override /*1*/ inline fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final inline override /*1*/ fun foo(): kotlin.Unit
public final override /*1*/ inline fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final inline override /*1*/ fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
public final override /*1*/ inline fun </*0*/ reified T> qux(/*0*/ x: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
@@ -30,10 +30,10 @@ public final class B : A {
public constructor B()
protected final override /*1*/ /*fake_override*/ val z: kotlin.String
public final override /*1*/ /*fake_override*/ var zVar: kotlin.String
public final inline override /*1*/ /*fake_override*/ fun call(): kotlin.Unit
internal final inline override /*1*/ /*fake_override*/ fun callFromInternal(): kotlin.Unit
protected final inline override /*1*/ /*fake_override*/ fun callFromProtected(): kotlin.Unit
@kotlin.PublishedApi internal final inline override /*1*/ /*fake_override*/ fun callFromPublished(): kotlin.Unit
public final override /*1*/ inline /*fake_override*/ fun call(): kotlin.Unit
internal final override /*1*/ inline /*fake_override*/ fun callFromInternal(): kotlin.Unit
protected final override /*1*/ inline /*fake_override*/ fun callFromProtected(): kotlin.Unit
@kotlin.PublishedApi internal final override /*1*/ inline /*fake_override*/ fun callFromPublished(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
protected final override /*1*/ /*fake_override*/ fun test(): kotlin.Unit
@@ -71,10 +71,10 @@ private final class X {
public constructor Z()
protected final override /*1*/ /*fake_override*/ val z: kotlin.String
public final override /*1*/ /*fake_override*/ var zVar: kotlin.String
public final inline override /*1*/ /*fake_override*/ fun call(): kotlin.Unit
internal final inline override /*1*/ /*fake_override*/ fun callFromInternal(): kotlin.Unit
protected final inline override /*1*/ /*fake_override*/ fun callFromProtected(): kotlin.Unit
@kotlin.PublishedApi internal final inline override /*1*/ /*fake_override*/ fun callFromPublished(): kotlin.Unit
public final override /*1*/ inline /*fake_override*/ fun call(): kotlin.Unit
internal final override /*1*/ inline /*fake_override*/ fun callFromInternal(): kotlin.Unit
protected final override /*1*/ inline /*fake_override*/ fun callFromProtected(): kotlin.Unit
@kotlin.PublishedApi internal final override /*1*/ inline /*fake_override*/ fun callFromPublished(): kotlin.Unit
public final inline fun effictivelyNonPublic(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+2 -2
View File
@@ -2,6 +2,6 @@ package
public inline fun inlineFun(/*0*/ s: (p: kotlin.Int) -> kotlin.Unit): kotlin.Unit
public inline fun </*0*/ T> inlineFun(/*0*/ s: T): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ V> ((T) -> V).inc(): (T) -> V
public inline operator fun </*0*/ T, /*1*/ V> ((T) -> V).inc(): (T) -> V
public inline fun </*0*/ T> (() -> T).inlineExt(): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ V> ((T) -> V).not(): kotlin.Boolean
public inline operator fun </*0*/ T, /*1*/ V> ((T) -> V).not(): kotlin.Boolean
@@ -3,10 +3,10 @@ package
public inline fun </*0*/ T, /*1*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> V, /*1*/ ext: T.(p: T) -> V): kotlin.Unit
public operator fun </*0*/ T, /*1*/ V> ((T) -> V).dec(): (T) -> V
public operator fun </*0*/ T, /*1*/ V> (T.(T) -> V).dec(): T.(T) -> V
public operator inline fun </*0*/ T, /*1*/ V> ((T) -> V).inc(): (T) -> V
public operator inline fun </*0*/ T, /*1*/ V> (T.(T) -> V).inc(): T.(T) -> V
public inline operator fun </*0*/ T, /*1*/ V> ((T) -> V).inc(): (T) -> V
public inline operator fun </*0*/ T, /*1*/ V> (T.(T) -> V).inc(): T.(T) -> V
public inline fun </*0*/ T, /*1*/ V> ((T) -> V).inlineFunWithInvoke(): kotlin.Unit
public operator fun </*0*/ T, /*1*/ V> ((T) -> V).unaryMinus(): (T) -> V
public operator fun </*0*/ T, /*1*/ V> (T.(T) -> V).unaryMinus(): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ V> ((T) -> V).unaryPlus(): (T) -> V
public operator inline fun </*0*/ T, /*1*/ V> (T.(T) -> V).unaryPlus(): kotlin.Unit
public inline operator fun </*0*/ T, /*1*/ V> ((T) -> V).unaryPlus(): (T) -> V
public inline operator fun </*0*/ T, /*1*/ V> (T.(T) -> V).unaryPlus(): kotlin.Unit
@@ -2,6 +2,6 @@ package
public inline fun </*0*/ T, /*1*/ V> inlineFunWithInvoke(/*0*/ s: (p: T) -> V): kotlin.Unit
public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (p: T, l: U) -> V, /*1*/ ext: T.(p: T, l: U) -> V): kotlin.Unit
public operator inline fun </*0*/ T, /*1*/ V> ((T) -> V).not(): kotlin.Boolean
public inline operator fun </*0*/ T, /*1*/ V> ((T) -> V).not(): kotlin.Boolean
public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).not(): kotlin.Boolean
public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).not(): kotlin.Boolean
@@ -14,7 +14,7 @@ public open class Base {
public final class Derived : Base {
public constructor Derived()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final inline override /*1*/ fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
public final override /*1*/ inline fun foo(/*0*/ a: kotlin.Int = ...): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}