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

Changed language sematics: imports with '*' do not import packages anymore

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-12-24 20:05:15 +03:00
parent d540f3b724
commit 1f17d7adcd
16 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/PackageQualified.kt
+3 -2
View File
@@ -4,8 +4,9 @@
package foobar.a
import java.*
val a : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>util.List<Int><!>? = null
val a1 : <!UNRESOLVED_REFERENCE!>ArrayList<!><Int>? = null
val a : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util.List<Int><!>? = null
val a2 : <!UNRESOLVED_REFERENCE!>util<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>List<!><Int>? = null
val a3 : <!UNRESOLVED_REFERENCE!>ArrayList<!><Int>? = null
// FILE: b.kt
package foobar
compiler/testData/diagnostics/tests/PackageQualified.txt
+2 -1
View File
@@ -58,7 +58,8 @@ package foobar {
package foobar.a {
internal val a: java.util.List<kotlin.Int>? = null
internal val a1: [ERROR : ArrayList<Int>]?
internal val a2: [ERROR : util.List<Int>]?
internal val a3: [ERROR : ArrayList<Int>]?
internal val b: kotlin.List<kotlin.Int>? = null
internal val b1: [ERROR : util.List<Int>]?
}
compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// Fixpoint generic in Java: Enum<T extends Enum<T>>
fun test(<!UNUSED_PARAMETER!>a<!> : annotation.RetentionPolicy) {
fun test(<!UNUSED_PARAMETER!>a<!> : java.lang.annotation.RetentionPolicy) {
}
compiler/testData/diagnostics/tests/ResolveToJava.kt
+1
View File
@@ -6,6 +6,7 @@ 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>()
compiler/testData/resolve/ResolveToJava.resolve
+1
View File
@@ -1,5 +1,6 @@
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)