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

fix tests in org.jetbrains.kotlin.renderer

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-09-04 19:45:46 +03:00
parent aa8c90893e
commit b9906f842d
12 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/renderer/Classes.kt
Vendored
+9 -9
View File
@@ -35,20 +35,20 @@ public class WithReified<reified A, reified out B>
public interface TwoUpperBounds<T> where T : Number, T : Any
//package rendererTest
//kotlin.annotation.annotation internal final class TheAnnotation : kotlin.Annotation defined in rendererTest
//kotlin.annotation.annotation public final class TheAnnotation : kotlin.Annotation defined in rendererTest
//public constructor TheAnnotation() defined in rendererTest.TheAnnotation
//kotlin.annotation.annotation internal final class AnotherAnnotation : kotlin.Annotation defined in rendererTest
//kotlin.annotation.annotation public final class AnotherAnnotation : kotlin.Annotation defined in rendererTest
//public constructor AnotherAnnotation() defined in rendererTest.AnotherAnnotation
//rendererTest.TheAnnotation public open class TheClass<out T : kotlin.Int, X> defined in rendererTest
//<out T : kotlin.Int> defined in rendererTest.TheClass
//<X> defined in rendererTest.TheClass
//rendererTest.AnotherAnnotation public constructor TheClass<out T : kotlin.Int, X>() defined in rendererTest.TheClass
//private final val privateVal: kotlin.Int defined in rendererTest.TheClass
//internal final val shouldBeFinal: kotlin.Int defined in rendererTest.TheClass
//internal final val <T> T.checkTypeParameterScope: kotlin.Int defined in rendererTest.TheClass
//public final val shouldBeFinal: kotlin.Int defined in rendererTest.TheClass
//public final val <T> T.checkTypeParameterScope: kotlin.Int defined in rendererTest.TheClass
//<T> defined in rendererTest.TheClass.checkTypeParameterScope
//internal final fun T.<get-checkTypeParameterScope>(): kotlin.Int defined in rendererTest.TheClass
//internal final val <T> checkTypeParameterScope2: kotlin.Int defined in rendererTest.TheClass
//public final fun T.<get-checkTypeParameterScope>(): kotlin.Int defined in rendererTest.TheClass
//public final val <T> checkTypeParameterScope2: kotlin.Int defined in rendererTest.TheClass
//<T> defined in rendererTest.TheClass.checkTypeParameterScope2
//protected abstract fun foo(): kotlin.Unit defined in rendererTest.TheClass
//rendererTest.TheAnnotation private constructor TheClass<out T : kotlin.Int, X>() defined in rendererTest.TheClass
@@ -56,11 +56,11 @@ public interface TwoUpperBounds<T> where T : Number, T : Any
//public constructor Inner() defined in rendererTest.TheClass.Inner
//internal final class InternalClass defined in rendererTest
//public constructor InternalClass() defined in rendererTest.InternalClass
//internal interface TheTrait defined in rendererTest
//internal abstract fun abstractFun(): kotlin.Unit defined in rendererTest.TheTrait
//public interface TheTrait defined in rendererTest
//public abstract fun abstractFun(): kotlin.Unit defined in rendererTest.TheTrait
//public companion object : rendererTest.TheClass<kotlin.Int, kotlin.Int> defined in rendererTest.TheTrait
//private constructor Companion() defined in rendererTest.TheTrait.Companion
//internal final fun classObjectFunction(): kotlin.Int defined in rendererTest.TheTrait.Companion
//public final fun classObjectFunction(): kotlin.Int defined in rendererTest.TheTrait.Companion
//public final class WithReified<reified A, reified out B> defined in rendererTest
//public constructor WithReified<reified A, reified out B>() defined in rendererTest.WithReified
//<reified A> defined in rendererTest.WithReified
compiler/testData/renderer/ErrorType.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
val a: E = 0
//internal val a: [ERROR : E] defined in root package
//public val a: [ERROR : E] defined in root package
compiler/testData/renderer/FunctionTypes.kt
Vendored
+18 -18
View File
@@ -22,28 +22,28 @@ var v11: GEF<Any, Any>
var v12: (() -> Unit).() -> Unit
var v13: (() -> Unit)?.() -> Unit
//internal var v1: () -> kotlin.Unit defined in root package
//internal var v2: (kotlin.Int) -> kotlin.Int defined in root package
//internal var v3: (kotlin.Int, kotlin.String) -> kotlin.String defined in root package
//internal var v4: (kotlin.Int) -> kotlin.String defined in root package
//internal var v4: (() -> kotlin.Int, (kotlin.String) -> kotlin.Unit) -> kotlin.String defined in root package
//internal var v5: kotlin.Int.() -> kotlin.Int defined in root package
//internal var v6: kotlin.Int.(kotlin.String, kotlin.Int) -> kotlin.Unit defined in root package
//internal var v7: kotlin.Int.(kotlin.String) -> kotlin.Boolean defined in root package
//internal final class F : () -> kotlin.Unit defined in root package
//public var v1: () -> kotlin.Unit defined in root package
//public var v2: (kotlin.Int) -> kotlin.Int defined in root package
//public var v3: (kotlin.Int, kotlin.String) -> kotlin.String defined in root package
//public var v4: (kotlin.Int) -> kotlin.String defined in root package
//public var v4: (() -> kotlin.Int, (kotlin.String) -> kotlin.Unit) -> kotlin.String defined in root package
//public var v5: kotlin.Int.() -> kotlin.Int defined in root package
//public var v6: kotlin.Int.(kotlin.String, kotlin.Int) -> kotlin.Unit defined in root package
//public var v7: kotlin.Int.(kotlin.String) -> kotlin.Boolean defined in root package
//public final class F : () -> kotlin.Unit defined in root package
//public constructor F() defined in F
//internal var v8: F defined in root package
//internal final class EF : kotlin.String.() -> kotlin.Unit defined in root package
//public var v8: F defined in root package
//public final class EF : kotlin.String.() -> kotlin.Unit defined in root package
//public constructor EF() defined in EF
//internal var v9: EF defined in root package
//internal final class GF<T> : () -> T defined in root package
//public var v9: EF defined in root package
//public final class GF<T> : () -> T defined in root package
//public constructor GF<T>() defined in GF
//<T> defined in GF
//internal var v10: GF<kotlin.Any> defined in root package
//internal final class GEF<A, B> : A.() -> B defined in root package
//public var v10: GF<kotlin.Any> defined in root package
//public final class GEF<A, B> : A.() -> B defined in root package
//public constructor GEF<A, B>() defined in GEF
//<A> defined in GEF
//<B> defined in GEF
//internal var v11: GEF<kotlin.Any, kotlin.Any> defined in root package
//internal var v12: (() -> kotlin.Unit).() -> kotlin.Unit defined in root package
//internal var v13: (() -> kotlin.Unit)?.() -> kotlin.Unit defined in root package
//public var v11: GEF<kotlin.Any, kotlin.Any> defined in root package
//public var v12: (() -> kotlin.Unit).() -> kotlin.Unit defined in root package
//public var v13: (() -> kotlin.Unit)?.() -> kotlin.Unit defined in root package
compiler/testData/renderer/FunctionTypesInSignature.kt
Vendored
+9 -9
View File
@@ -26,17 +26,17 @@ fun <T> (T.(Int) -> Unit).f8() {
val Function0<(() -> Unit) -> (() -> Unit)>.p: Unit = Unit
//package test
//internal fun (() -> kotlin.Unit).f1(f: () -> kotlin.Unit): () -> kotlin.Int defined in test
//public fun (() -> kotlin.Unit).f1(f: () -> kotlin.Unit): () -> kotlin.Int defined in test
//value-parameter val f: () -> kotlin.Unit defined in test.f1
//internal fun (() -> kotlin.Unit).f2(f: () -> kotlin.Unit): () -> kotlin.Int defined in test
//public fun (() -> kotlin.Unit).f2(f: () -> kotlin.Unit): () -> kotlin.Int defined in test
//value-parameter val f: () -> kotlin.Unit defined in test.f2
//internal fun ((() -> kotlin.Unit) -> kotlin.Unit).f3(f: () -> () -> kotlin.Unit): () -> () -> kotlin.Int defined in test
//public fun ((() -> kotlin.Unit) -> kotlin.Unit).f3(f: () -> () -> kotlin.Unit): () -> () -> kotlin.Int defined in test
//value-parameter val f: () -> () -> kotlin.Unit defined in test.f3
//internal fun (() -> () -> kotlin.Unit).f4(f: (() -> kotlin.Unit, () -> kotlin.Unit) -> kotlin.Unit): (() -> kotlin.Unit) -> () -> kotlin.Unit defined in test
//public fun (() -> () -> kotlin.Unit).f4(f: (() -> kotlin.Unit, () -> kotlin.Unit) -> kotlin.Unit): (() -> kotlin.Unit) -> () -> kotlin.Unit defined in test
//value-parameter val f: (() -> kotlin.Unit, () -> kotlin.Unit) -> kotlin.Unit defined in test.f4
//internal fun (() -> (() -> kotlin.Unit) -> () -> kotlin.Unit).f5(): kotlin.Unit defined in test
//internal fun (() -> (() -> kotlin.Unit) -> () -> kotlin.Unit)?.f6(): kotlin.Unit defined in test
//internal fun ((kotlin.Int) -> kotlin.Unit)?.f7(): kotlin.Unit defined in test
//internal fun <T> (T.(kotlin.Int) -> kotlin.Unit).f8(): kotlin.Unit defined in test
//public fun (() -> (() -> kotlin.Unit) -> () -> kotlin.Unit).f5(): kotlin.Unit defined in test
//public fun (() -> (() -> kotlin.Unit) -> () -> kotlin.Unit)?.f6(): kotlin.Unit defined in test
//public fun ((kotlin.Int) -> kotlin.Unit)?.f7(): kotlin.Unit defined in test
//public fun <T> (T.(kotlin.Int) -> kotlin.Unit).f8(): kotlin.Unit defined in test
//<T> defined in test.f8
//internal val (() -> (() -> kotlin.Unit) -> () -> kotlin.Unit).p: kotlin.Unit defined in test
//public val (() -> (() -> kotlin.Unit) -> () -> kotlin.Unit).p: kotlin.Unit defined in test
compiler/testData/renderer/GlobalFunctions.kt
Vendored
+5 -5
View File
@@ -22,7 +22,7 @@ Deprecated("") fun deprecatedFun()
//package rendererTest
//public fun pub(): kotlin.Unit defined in rendererTest
//internal fun int(): kotlin.String defined in rendererTest
//internal fun int2(vararg ints: kotlin.Int): kotlin.Int defined in rendererTest
//public fun int2(vararg ints: kotlin.Int): kotlin.Int defined in rendererTest
//value-parameter vararg val ints: kotlin.Int defined in rendererTest.int2
//private fun prv(a: kotlin.String, b: kotlin.Int = ...): kotlin.Int defined in rendererTest
//value-parameter val a: kotlin.String defined in rendererTest.prv
@@ -31,8 +31,8 @@ Deprecated("") fun deprecatedFun()
//public fun <out T> withTypeParam(a: kotlin.Array<T>): kotlin.Int defined in rendererTest
//<out T> defined in rendererTest.withTypeParam
//value-parameter val a: kotlin.Array<T> defined in rendererTest.withTypeParam
//internal interface Foo defined in rendererTest
//internal interface Bar defined in rendererTest
//internal fun <P : rendererTest.Foo> funTypeParameterWithTwoUpperBounds(): kotlin.Int where P : rendererTest.Bar defined in rendererTest
//public interface Foo defined in rendererTest
//public interface Bar defined in rendererTest
//public fun <P : rendererTest.Foo> funTypeParameterWithTwoUpperBounds(): kotlin.Int where P : rendererTest.Bar defined in rendererTest
//<P : rendererTest.Foo & rendererTest.Bar> defined in rendererTest.funTypeParameterWithTwoUpperBounds
//kotlin.Deprecated internal fun deprecatedFun(): kotlin.Unit defined in rendererTest
//kotlin.Deprecated public fun deprecatedFun(): kotlin.Unit defined in rendererTest
compiler/testData/renderer/GlobalProperties.kt
Vendored
+2 -2
View File
@@ -19,11 +19,11 @@ get() {}
//package rendererTest
//public val pub: kotlin.String defined in rendererTest
//internal var int: kotlin.String defined in rendererTest
//internal val int2: kotlin.Int defined in rendererTest
//public val int2: kotlin.Int defined in rendererTest
//private var private: kotlin.Int defined in rendererTest
//public val kotlin.Int.ext: kotlin.Int defined in rendererTest
//public fun kotlin.Int.<get-ext>(): kotlin.Int defined in rendererTest
//kotlin.Deprecated internal val deprecatedVal: kotlin.Int defined in rendererTest
//kotlin.Deprecated public val deprecatedVal: kotlin.Int defined in rendererTest
//public val <T : kotlin.CharSequence> T.extWithTwoUpperBounds: kotlin.Int where T : kotlin.Number defined in rendererTest
//<T : kotlin.CharSequence & kotlin.Number> defined in rendererTest.extWithTwoUpperBounds
//public fun T.<get-extWithTwoUpperBounds>(): kotlin.Int defined in rendererTest
compiler/testData/renderer/InheritedMembersVisibility.kt
Vendored
+5 -5
View File
@@ -15,16 +15,16 @@ class B : A {
get
}
//internal interface A defined in root package
//internal abstract val v: kotlin.Int defined in A
//public interface A defined in root package
//public abstract val v: kotlin.Int defined in A
//public abstract var int: kotlin.Int defined in A
//private abstract fun <set-int>(<set-?>: kotlin.Int): kotlin.Unit defined in A
//protected abstract fun f(): kotlin.Int defined in A
//internal final class B : A defined in root package
//public final class B : A defined in root package
//public constructor B() defined in B
//public open var int: kotlin.Int defined in B
//public open fun <get-int>(): kotlin.Int defined in B
//private open fun <set-int>(<set-?>: kotlin.Int): kotlin.Unit defined in B
//protected open fun f(): kotlin.Int defined in B
//internal open val v: kotlin.Int defined in B
//internal open fun <get-v>(): kotlin.Int defined in B
//public open val v: kotlin.Int defined in B
//public open fun <get-v>(): kotlin.Int defined in B
compiler/testData/renderer/KeywordsInNames.kt
Vendored
+11 -11
View File
@@ -17,21 +17,21 @@ val AS_SAFE = 1
val NOT_IN = 2
val NOT_IS = 3
//kotlin.annotation.annotation internal final class `true` : kotlin.Annotation defined in root package
//kotlin.annotation.annotation public final class `true` : kotlin.Annotation defined in root package
//public constructor `true`() defined in `true`
//internal val `val`: kotlin.Int defined in root package
//`true` internal interface `interface` defined in root package
//internal final class `class`<`in`> defined in root package
//public val `val`: kotlin.Int defined in root package
//`true` public interface `interface` defined in root package
//public final class `class`<`in`> defined in root package
//<`in`> defined in `class`
//public constructor `class`<`in`>(p: `in`?) defined in `class`
//value-parameter val p: `in`? defined in `class`.<init>
//internal final inner class `class` defined in `class`
//public final inner class `class` defined in `class`
//public constructor `class`() defined in `class`.`class`
//internal val `is`: `class`.`class` defined in root package
//internal val `in`: `class`<`interface`> defined in root package
//internal fun <`in` : `interface`> `interface`.`fun`(`false`: `interface`): `interface` where `in` : kotlin.Number defined in root package
//public val `is`: `class`.`class` defined in root package
//public val `in`: `class`<`interface`> defined in root package
//public fun <`in` : `interface`> `interface`.`fun`(`false`: `interface`): `interface` where `in` : kotlin.Number defined in root package
//<`in` : `interface` & kotlin.Number> defined in `fun`
//value-parameter val `false`: `interface` defined in `fun`
//internal val AS_SAFE: kotlin.Int defined in root package
//internal val NOT_IN: kotlin.Int defined in root package
//internal val NOT_IS: kotlin.Int defined in root package
//public val AS_SAFE: kotlin.Int defined in root package
//public val NOT_IN: kotlin.Int defined in root package
//public val NOT_IS: kotlin.Int defined in root package
compiler/testData/renderer/ObjectWithConstructor.kt
Vendored
+3 -3
View File
@@ -16,18 +16,18 @@ class A3 {
}
}
//internal object A1 defined in root package
//public object A1 defined in root package
//private constructor A1() defined in A1
//private constructor A1(x: kotlin.Int = ..., y: kotlin.Int) defined in A1
//value-parameter val x: kotlin.Int = ... defined in A1.<init>
//value-parameter val y: kotlin.Int defined in A1.<init>
//internal object A2 defined in root package
//public object A2 defined in root package
//public constructor A2(prop: kotlin.Int) defined in A2
//value-parameter val prop: kotlin.Int defined in A2.<init>
//private constructor A2(x: kotlin.Int = ..., y: kotlin.Int) defined in A2
//value-parameter val x: kotlin.Int = ... defined in A2.<init>
//value-parameter val y: kotlin.Int defined in A2.<init>
//internal final class A3 defined in root package
//public final class A3 defined in root package
//public constructor A3() defined in A3
//public companion object defined in A3
//private constructor B(prop: kotlin.Int) defined in A3.B
compiler/testData/renderer/StarProjection.kt
Vendored
+4 -4
View File
@@ -8,12 +8,12 @@ fun foo(c: C<*>) {}
fun foo1(c: C<C<*>>) {}
//package rendererTest
//internal final class C<T : rendererTest.C<T>> defined in rendererTest
//public final class C<T : rendererTest.C<T>> defined in rendererTest
//public constructor C<T : rendererTest.C<T>>() defined in rendererTest.C
//<T : rendererTest.C<T>> defined in rendererTest.C
//internal final fun foo(c: rendererTest.C<*>): kotlin.Unit defined in rendererTest.C
//public final fun foo(c: rendererTest.C<*>): kotlin.Unit defined in rendererTest.C
//value-parameter val c: rendererTest.C<*> defined in rendererTest.C.foo
//internal fun foo(c: rendererTest.C<*>): kotlin.Unit defined in rendererTest
//public fun foo(c: rendererTest.C<*>): kotlin.Unit defined in rendererTest
//value-parameter val c: rendererTest.C<*> defined in rendererTest.foo
//internal fun foo1(c: rendererTest.C<rendererTest.C<*>>): kotlin.Unit defined in rendererTest
//public fun foo1(c: rendererTest.C<rendererTest.C<*>>): kotlin.Unit defined in rendererTest
//value-parameter val c: rendererTest.C<rendererTest.C<*>> defined in rendererTest.foo1
compiler/testData/renderer/TraitWithConstructor.kt
Vendored
+2 -2
View File
@@ -10,12 +10,12 @@ trait A2 private constructor(private val prop: Int) {
}
}
//internal interface A1 defined in root package
//public interface A1 defined in root package
//public constructor A1() defined in A1
//public constructor A1(x: kotlin.Int = ..., y: kotlin.Int) defined in A1
//value-parameter val x: kotlin.Int = ... defined in A1.<init>
//value-parameter val y: kotlin.Int defined in A1.<init>
//internal interface A2 defined in root package
//public interface A2 defined in root package
//private constructor A2(prop: kotlin.Int) defined in A2
//value-parameter val prop: kotlin.Int defined in A2.<init>
//public constructor A2(x: kotlin.Int = ..., y: kotlin.Int) defined in A2
compiler/testData/renderer/UnitType.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
var v1: Unit
var v2: Unit?
//internal var v1: kotlin.Unit defined in root package
//internal var v2: kotlin.Unit? defined in root package
//public var v1: kotlin.Unit defined in root package
//public var v2: kotlin.Unit? defined in root package