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

Fix compiler tests

Browse Source
This commit is contained in:
Yan Zhulanow
2015-09-21 23:40:34 +03:00
parent 35362a0f3b
commit 6db9344659
319 changed files with 1034 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/smartCasts/fieldPlus.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
// Advancement of KT-9126
class My(val x: Int?) {
fun plus(y: My) = if (this.x != null) this else y
operator fun plus(y: My) = if (this.x != null) this else y
}
fun foo() {
compiler/testData/diagnostics/tests/smartCasts/fieldPlus.txt
Vendored
+1 -1
View File
@@ -7,6 +7,6 @@ public final class My {
public final val x: kotlin.Int?
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 fun plus(/*0*/ y: My): My
public final operator fun plus(/*0*/ y: My): My
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.kt
Vendored
+1 -1
View File
@@ -33,7 +33,7 @@ public data class Tag(public var tagName: String) {
//from library
fun <K, V> MutableMap<K, V>.set(key : K, value : V) = this.put(key, value)
operator fun <K, V> MutableMap<K, V>.set(key : K, value : V) = this.put(key, value)
fun arrayListOf<T>(vararg <!UNUSED_PARAMETER!>values<!>: T): MutableList<T> = throw Exception()
compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ package
package a {
public fun </*0*/ T> arrayListOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.MutableList<T>
public fun foo(/*0*/ map: kotlin.MutableMap<kotlin.Int, kotlin.String>, /*1*/ value: kotlin.String?): kotlin.Unit
public fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
public operator fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
@kotlin.data() public final class Tag {
public constructor Tag(/*0*/ tagName: kotlin.String)
@@ -11,7 +11,7 @@ package a {
public final val contents: kotlin.MutableList<a.Tag>
public final var id: kotlin.String?
public final var tagName: kotlin.String
public final /*synthesized*/ fun component1(): kotlin.String
public final operator /*synthesized*/ fun component1(): kotlin.String
public final /*synthesized*/ fun copy(/*0*/ tagName: kotlin.String = ...): a.Tag
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/smartCasts/kt2865.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
fun <K, V> MutableMap<K, V>.set(k: K, v: V) {}
operator fun <K, V> MutableMap<K, V>.set(k: K, v: V) {}
fun foo(a: MutableMap<String, String>, x: String?) {
a[x!!] = <!DEBUG_INFO_SMARTCAST!>x<!>
compiler/testData/diagnostics/tests/smartCasts/kt2865.txt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ package
public fun foo(/*0*/ a: kotlin.MutableMap<kotlin.String, kotlin.String>, /*1*/ x: kotlin.String?): kotlin.Unit
public fun foo1(/*0*/ a: kotlin.MutableMap<kotlin.String, kotlin.String>, /*1*/ x: kotlin.String?): kotlin.Unit
public fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ k: K, /*1*/ v: V): kotlin.Unit
public operator fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ k: K, /*1*/ v: V): kotlin.Unit
compiler/testData/diagnostics/tests/smartCasts/kt3711.txt
Vendored
+2 -2
View File
@@ -7,8 +7,8 @@ public fun kotlin.String.to(/*0*/ second: kotlin.String): StringPair
public constructor StringPair(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String)
public final val first: kotlin.String
public final val second: kotlin.String
public final /*synthesized*/ fun component1(): kotlin.String
public final /*synthesized*/ fun component2(): kotlin.String
public final operator /*synthesized*/ fun component1(): kotlin.String
public final operator /*synthesized*/ fun component2(): kotlin.String
public final /*synthesized*/ fun copy(/*0*/ first: kotlin.String = ..., /*1*/ second: kotlin.String = ...): StringPair
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/smartCasts/kt3899.txt
Vendored
+2 -2
View File
@@ -8,8 +8,8 @@ public fun kotlin.String.to(/*0*/ second: kotlin.String): StringPair
public constructor StringPair(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String)
public final val first: kotlin.String
public final val second: kotlin.String
public final /*synthesized*/ fun component1(): kotlin.String
public final /*synthesized*/ fun component2(): kotlin.String
public final operator /*synthesized*/ fun component1(): kotlin.String
public final operator /*synthesized*/ fun component2(): kotlin.String
public final /*synthesized*/ fun copy(/*0*/ first: kotlin.String = ..., /*1*/ second: kotlin.String = ...): StringPair
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/smartCasts/safecalls/property.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public fun foo(/*0*/ y: MyClass): kotlin.Int
@kotlin.data() public final class MyClass {
public constructor MyClass(/*0*/ x: kotlin.String?)
public final val x: kotlin.String?
public final /*synthesized*/ fun component1(): kotlin.String?
public final operator /*synthesized*/ fun component1(): kotlin.String?
public final /*synthesized*/ fun copy(/*0*/ x: kotlin.String? = ...): MyClass
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/smartCasts/varnotnull/doWhileWithBreak.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public fun list(/*0*/ start: SomeObject): kotlin.Unit
@kotlin.data() public final class SomeObject {
public constructor SomeObject(/*0*/ n: SomeObject?)
public final val n: SomeObject?
public final /*synthesized*/ fun component1(): SomeObject?
public final operator /*synthesized*/ fun component1(): SomeObject?
public final /*synthesized*/ fun copy(/*0*/ n: SomeObject? = ...): SomeObject
public final fun doSomething(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public fun list(/*0*/ start: SomeObject): SomeObject
@kotlin.data() public final class SomeObject {
public constructor SomeObject(/*0*/ n: SomeObject?)
public final val n: SomeObject?
public final /*synthesized*/ fun component1(): SomeObject?
public final operator /*synthesized*/ fun component1(): SomeObject?
public final /*synthesized*/ fun copy(/*0*/ n: SomeObject? = ...): SomeObject
public final fun doSomething(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public fun list(/*0*/ start: SomeObject): SomeObject
@kotlin.data() public final class SomeObject {
public constructor SomeObject(/*0*/ n: SomeObject?)
public final val n: SomeObject?
public final /*synthesized*/ fun component1(): SomeObject?
public final operator /*synthesized*/ fun component1(): SomeObject?
public final /*synthesized*/ fun copy(/*0*/ n: SomeObject? = ...): SomeObject
public final fun doSomething(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public fun list(/*0*/ start: SomeObject): SomeObject
@kotlin.data() public final class SomeObject {
public constructor SomeObject(/*0*/ n: SomeObject?)
public final val n: SomeObject?
public final /*synthesized*/ fun component1(): SomeObject?
public final operator /*synthesized*/ fun component1(): SomeObject?
public final /*synthesized*/ fun copy(/*0*/ n: SomeObject? = ...): SomeObject
public final fun doSomething(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/smartCasts/varnotnull/infiniteWhileWithBreak.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public fun list(/*0*/ start: SomeObject): kotlin.Unit
@kotlin.data() public final class SomeObject {
public constructor SomeObject(/*0*/ n: SomeObject?)
public final val n: SomeObject?
public final /*synthesized*/ fun component1(): SomeObject?
public final operator /*synthesized*/ fun component1(): SomeObject?
public final /*synthesized*/ fun copy(/*0*/ n: SomeObject? = ...): SomeObject
public final fun doSomething(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/smartCasts/varnotnull/iterations.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public fun list(/*0*/ start: SomeObject): kotlin.Unit
@kotlin.data() public final class SomeObject {
public constructor SomeObject(/*0*/ n: SomeObject?)
public final val n: SomeObject?
public final /*synthesized*/ fun component1(): SomeObject?
public final operator /*synthesized*/ fun component1(): SomeObject?
public final /*synthesized*/ fun copy(/*0*/ n: SomeObject? = ...): SomeObject
public final fun doSomething(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
class MyClass
// In principle it is not correct, MyClass? is not a subtype of MyClass
fun MyClass.inc(): MyClass? { return null }
operator fun MyClass.inc(): MyClass? { return null }
public fun box() : MyClass? {
var i : MyClass?
compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package
public fun box(): MyClass?
public fun MyClass.inc(): MyClass?
public operator fun MyClass.inc(): MyClass?
public final class MyClass {
public constructor MyClass()
compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNullableClassIncrement.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
class MyClass
// Correct at compile time but wrong at run-time
fun MyClass?.inc(): MyClass? { return null }
operator fun MyClass?.inc(): MyClass? { return null }
public fun box() : MyClass? {
var i : MyClass?
compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNullableClassIncrement.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package
public fun box(): MyClass?
public fun MyClass?.inc(): MyClass?
public operator fun MyClass?.inc(): MyClass?
public final class MyClass {
public constructor MyClass()
compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNullableIncrement.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
fun Int?.inc(): Int? { return this }
operator fun Int?.inc(): Int? { return this }
public fun box(arg: Int?) : Int? {
var i : Int? = arg
compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNullableIncrement.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
package
public fun box(/*0*/ arg: kotlin.Int?): kotlin.Int?
public fun kotlin.Int?.inc(): kotlin.Int?
public operator fun kotlin.Int?.inc(): kotlin.Int?
compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
class MyClass
// In principle it is not correct, MyClass? is not a subtype of MyClass
fun MyClass.inc(): MyClass? { return null }
operator fun MyClass.inc(): MyClass? { return null }
public fun box() {
var i : MyClass?
compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package
public fun box(): kotlin.Unit
public fun MyClass.inc(): MyClass?
public operator fun MyClass.inc(): MyClass?
public final class MyClass {
public constructor MyClass()
compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNullableClassIncrement.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
class MyClass
// Correct at compile time but wrong at run-time
fun MyClass?.inc(): MyClass? { return null }
operator fun MyClass?.inc(): MyClass? { return null }
public fun box() {
var i : MyClass?
compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNullableClassIncrement.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package
public fun box(): kotlin.Unit
public fun MyClass?.inc(): MyClass?
public operator fun MyClass?.inc(): MyClass?
public final class MyClass {
public constructor MyClass()
compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNullableIncrement.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
fun Int?.inc(): Int? { return this }
operator fun Int?.inc(): Int? { return this }
public fun box(arg: Int?) : Int? {
var i = arg
compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNullableIncrement.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
package
public fun box(/*0*/ arg: kotlin.Int?): kotlin.Int?
public fun kotlin.Int?.inc(): kotlin.Int?
public operator fun kotlin.Int?.inc(): kotlin.Int?
compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt
Vendored
+3 -3
View File
@@ -1,10 +1,10 @@
fun create(): Map<String, String> = null!!
fun <K, V> Map<K, V>.iterator(): Iterator<Map.Entry<K, V>> = null!!
operator fun <K, V> Map<K, V>.iterator(): Iterator<Map.Entry<K, V>> = null!!
fun <K, V> Map.Entry<K, V>.component1() = getKey()
operator fun <K, V> Map.Entry<K, V>.component1() = getKey()
fun <K, V> Map.Entry<K, V>.component2() = getValue()
operator fun <K, V> Map.Entry<K, V>.component2() = getValue()
class MyClass {
private var m: Map<String, String>? = null
compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.txt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
package
public fun create(): kotlin.Map<kotlin.String, kotlin.String>
public fun </*0*/ K, /*1*/ V> kotlin.Map.Entry<K, V>.component1(): K
public fun </*0*/ K, /*1*/ V> kotlin.Map.Entry<K, V>.component2(): V
public fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.iterator(): kotlin.Iterator<kotlin.Map.Entry<K, V>>
public operator fun </*0*/ K, /*1*/ V> kotlin.Map.Entry<K, V>.component1(): K
public operator fun </*0*/ K, /*1*/ V> kotlin.Map.Entry<K, V>.component2(): V
public operator fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.iterator(): kotlin.Iterator<kotlin.Map.Entry<K, V>>
public final class MyClass {
public constructor MyClass()
compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileWithBreak.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public fun list(/*0*/ start: SomeObject): kotlin.Unit
@kotlin.data() public final class SomeObject {
public constructor SomeObject(/*0*/ n: SomeObject?)
public final val n: SomeObject?
public final /*synthesized*/ fun component1(): SomeObject?
public final operator /*synthesized*/ fun component1(): SomeObject?
public final /*synthesized*/ fun copy(/*0*/ n: SomeObject? = ...): SomeObject
public final fun doSomething(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean