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

Fixed testdata -- removed package import

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-09-13 04:27:53 +03:00
parent 387d16d1d5
commit 8efbf4fc32
56 changed files with 58 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/compileKotlinAgainstKotlin/SecondaryConstructors.B.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
import java.lang
class B1() : A("123") {
constructor(x1: Int): this() {}
compiler/testData/diagnostics/tests/ResolveToJava.kt
Vendored
-2
View File
@@ -8,7 +8,6 @@ import <!UNRESOLVED_REFERENCE!>utils<!>.*
import java.io.PrintStream
import <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Comparable<!> as Com
import java.util
val l : MutableList<in Int> = ArrayList<Int>()
@@ -16,7 +15,6 @@ fun test(<!UNUSED_PARAMETER!>l<!> : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util
val <!UNUSED_VARIABLE!>x<!> : java.<!UNRESOLVED_REFERENCE!>List<!>
val <!UNUSED_VARIABLE!>y<!> : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util.List<Int><!>
val <!UNUSED_VARIABLE!>b<!> : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.lang.Object<!>
val <!UNUSED_VARIABLE!>a<!> : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>util.List<Int><!>
val <!UNUSED_VARIABLE!>z<!> : java.<!UNRESOLVED_REFERENCE!>utils<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>List<!><Int>
val <!UNUSED_VARIABLE!>f<!> : java.io.File? = null
compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt
Vendored
+2 -8
View File
@@ -6,7 +6,7 @@ val y : Any? = 2
// FILE: b.kt
package example
import example.ns
import example.ns.y
object Obj {
val y : Any? = 2
@@ -22,14 +22,8 @@ val x : Any? = 1
fun Any?.vars(<!UNUSED_PARAMETER!>a<!>: Any?) : Int {
var <!ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE!>b<!>: Int = 0
if (ns.y is Int) {
<!UNUSED_VALUE!>b =<!> <!DEBUG_INFO_SMARTCAST!>ns.y<!>
}
if (ns.y is Int) {
<!UNUSED_VALUE!>b =<!> <!DEBUG_INFO_SMARTCAST!>example.ns.y<!>
}
if (example.ns.y is Int) {
<!UNUSED_VALUE!>b =<!> <!DEBUG_INFO_SMARTCAST!>ns.y<!>
<!UNUSED_VALUE!>b =<!> <!DEBUG_INFO_SMARTCAST!>y<!>
}
if (example.ns.y is Int) {
<!UNUSED_VALUE!>b =<!> <!DEBUG_INFO_SMARTCAST!>example.ns.y<!>
compiler/testData/resolve/ResolveToJava.resolve
Vendored
+4 -5
View File
@@ -1,29 +1,28 @@
import `java::java`java.*
import java.`java::java.util`util.*
import java.util
fun foo(~a~a : `kotlin::Array`Array<`kotlin::Int`Int>) : `java::java.util.ArrayList`ArrayList {
`a`a.`kotlin::Array.get(Int)`get(1)
`a`a.`kotlin::Array.set(Int, Int)`set(1, 1)
}
fun foo(o : `java::java.lang.Object`Object, l : `java::java.util`util.`java::java.util.ArrayList`ArrayList) : `java::java.util.ArrayList`ArrayList {}
fun foo(o : `java::java.lang.Object`Object, l : `java::java`java.`java::java.util`util.`java::java.util.ArrayList`ArrayList) : `java::java.util.ArrayList`ArrayList {}
~A~class A~A()~() {
fun f(a : `java::java.util`util.`java::java.util.ArrayList`ArrayList) {}
fun f(a : `java::java`java.`java::java.util`util.`java::java.util.ArrayList`ArrayList) {}
fun f(a : `java::java.util.ArrayList`ArrayList) {}
}
class B : `java::java.lang.Object`Object {
fun f(a : `java::java.util`util.`java::java.util.ArrayList`ArrayList) {}
fun f(a : `java::java`java.`java::java.util`util.`java::java.util.ArrayList`ArrayList) {}
fun f(a : `java::java.util.ArrayList`ArrayList) {}
~foo~fun foo(abc : `A`A) : `A`A {
`java::java`java.`java::java.lang`lang.`java::java.lang.System`System.`java::java.lang.System.out`out.`java::java.io.PrintStream.print(Int)`print(1)
`java::java.util`util.`java::java.util.Collections`Collections.`java::java.util.Collections.emptyList()`emptyList()
`java::java`java.`java::java.util`util.`java::java.util.Collections`Collections.`java::java.util.Collections.emptyList()`emptyList()
`java::java`java.`!`Foo
`java::java.util.Collections`Collections.`java::java.util.Collections.emptyList()`emptyList()
}