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

Temporarily remove JvmPackageName and tests, but keep the implementation

Browse Source 
This is needed because we want the compiler code to stay as much the
same in master and in 1.2 as possible
This commit is contained in:
Alexander Udalov
2017-09-13 16:07:54 +03:00
parent e8e38d90ff
commit 9ae6feb2c5
35 changed files with 0 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/jvmPackageName/rootPackage.kt
Vendored
-18
View File
@@ -1,18 +0,0 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// LANGUAGE_VERSION: 1.2
// FILE: foo.kt
@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
@file:JvmPackageName("jjj")
fun f(): String = "O"
val g: String? get() = "K"
inline fun i(block: () -> String) = block()
// FILE: bar.kt
fun box(): String = i { f() + g }
compiler/testData/codegen/box/jvmPackageName/simple.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// LANGUAGE_VERSION: 1.2
// FILE: foo.kt
@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
@file:JvmPackageName("baz.foo.quux.bar")
package foo.bar
fun f(): String = "O"
val g: String? get() = "K"
inline fun <T> i(block: () -> T): T = block()
// FILE: bar.kt
import foo.bar.*
fun box(): String = i { f() + g }
compiler/testData/codegen/box/jvmPackageName/withJvmName.kt
Vendored
-19
View File
@@ -1,19 +0,0 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// LANGUAGE_VERSION: 1.2
// FILE: foo.kt
@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
@file:JvmPackageName("jjj")
@file:JvmName("Foooo")
fun f(): String = "O"
val g: String? get() = "K"
inline fun i(block: () -> String) = block()
// FILE: bar.kt
fun box(): String = i { f() + g }
compiler/testData/codegen/boxInline/jvmPackageName/simple.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// TARGET_BACKEND: JVM
// WITH_RUNTIME
// LANGUAGE_VERSION: 1.2
// FILE: 1.kt
@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
@file:JvmPackageName("baz.foo.quux.bar")
package foo.bar
fun f(): String = "O"
val g: String? get() = "K"
inline fun <T> i(block: () -> T): T = block()
// FILE: 2.kt
import foo.bar.*
fun box(): String = i { f() + g }
compiler/testData/compileKotlinAgainstKotlin/jvmPackageName.kt
Vendored
-26
View File
@@ -1,26 +0,0 @@
// IGNORE_BACKEND: NATIVE
// FILE: A.kt
// LANGUAGE_VERSION: 1.2
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@file:JvmPackageName("bar")
package foo
fun f() = "OK"
var v: Int = 1
inline fun i(block: () -> Unit) = block()
// FILE: B.kt
// LANGUAGE_VERSION: 1.2
import foo.*
fun box(): String {
v = 2
if (v != 2) return "Fail"
i { v = 3 }
if (v != 3) return "Fail"
return f()
}
compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt
Vendored
-19
View File
@@ -1,19 +0,0 @@
// IGNORE_BACKEND: NATIVE
// FILE: A.kt
// LANGUAGE_VERSION: 1.2
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@file:JvmPackageName("bar")
fun f() = "OK"
var v: Int = 1
// FILE: B.kt
// LANGUAGE_VERSION: 1.2
fun box(): String {
v = 2
if (v != 2) return "Fail"
return f()
}
compiler/testData/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt
Vendored
-23
View File
@@ -1,23 +0,0 @@
// IGNORE_BACKEND: NATIVE
// FILE: A.kt
// LANGUAGE_VERSION: 1.2
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@file:JvmPackageName("bar")
@file:JvmName("Baz")
package foo
fun f() = "OK"
var v: Int = 1
// FILE: B.kt
// LANGUAGE_VERSION: 1.2
import foo.*
fun box(): String {
v = 2
if (v != 2) return "Fail"
return f()
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName/incorrectJvmPackageName.kt
Vendored
-34
View File
@@ -1,34 +0,0 @@
// !DIAGNOSTICS: -INVISIBLE_MEMBER -INVISIBLE_REFERENCE
// !API_VERSION: 1.2
// FILE: a.kt
<!JVM_PACKAGE_NAME_NOT_SUPPORTED_IN_MULTIFILE_CLASSES!>@file:JvmPackageName("a")<!>
@file:JvmMultifileClass
package a
fun a() {}
// FILE: b.kt
<!JVM_PACKAGE_NAME_CANNOT_BE_EMPTY!>@file:JvmPackageName("")<!>
package b
fun b() {}
// FILE: c.kt
<!JVM_PACKAGE_NAME_MUST_BE_VALID_NAME!>@file:JvmPackageName("invalid-fq-name")<!>
package c
fun c() {}
// FILE: d.kt
<!JVM_PACKAGE_NAME_NOT_SUPPORTED_IN_FILES_WITH_CLASSES!>@file:JvmPackageName("d")<!>
package d
class D
fun d() {}
// FILE: e.kt
@file:JvmPackageName(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!>)
package e
fun e() {}
// FILE: f.kt
@file:JvmPackageName(<!EXPRESSION_EXPECTED_PACKAGE_FOUND!>f<!>)
package f
const val name = "f"
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmPackageName/incorrectJvmPackageName.txt
Vendored
-32
View File
@@ -1,32 +0,0 @@
package
package a {
public fun a(): kotlin.Unit
}
package b {
public fun b(): kotlin.Unit
}
package c {
public fun c(): kotlin.Unit
}
package d {
public fun d(): kotlin.Unit
public final class D {
public constructor D()
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
}
}
package e {
public fun e(): kotlin.Unit
}
package f {
public const val name: kotlin.String = "f"
}
compiler/testData/jvmPackageTable/jvmPackageName/BarAsJ.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@file:JvmPackageName("j")
package bar
fun file0() {}
compiler/testData/jvmPackageTable/jvmPackageName/BarAsJJ.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@file:JvmName("JJ")
@file:JvmPackageName("jj")
package bar
fun jj() {}
compiler/testData/jvmPackageTable/jvmPackageName/Foo.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
package foo
fun file1() {}
compiler/testData/jvmPackageTable/jvmPackageName/FooAsJJJ.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@file:JvmPackageName("jjj")
package foo
fun file2() {}
compiler/testData/jvmPackageTable/jvmPackageName/FooMultiFile.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
@file:JvmMultifileClass
@file:JvmName("MultiFoo")
package foo
fun multiFile1() {}
compiler/testData/jvmPackageTable/jvmPackageName/jvm-package-table.txt
Vendored
-7
View File
@@ -1,7 +0,0 @@
bar
j/BarAsJKt
jj/JJ
foo
foo/MultiFoo__FooMultiFileKt (foo/MultiFoo)
foo/FooKt
jjj/FooAsJJJKt
compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/Foo.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
package foo
fun file1() {}
compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/FooAsJ.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@file:JvmPackageName("j")
package foo
fun file2() {}
compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/jvm-package-table.txt
Vendored
-2
View File
@@ -1,2 +0,0 @@
foo
foo/FooKt
compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo1.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@file:JvmPackageName("foo.jvm")
package foo
fun foo1() {}
compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo2.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@file:JvmPackageName("foo.jvm")
package foo
fun foo2() {}
compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo3.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
@file:JvmPackageName("foo.jvm")
package foo
fun foo3() {}
compiler/testData/jvmPackageTable/jvmPackageNameManyParts/jvm-package-table.txt
Vendored
-4
View File
@@ -1,4 +0,0 @@
foo
foo/jvm/Foo1Kt
foo/jvm/Foo2Kt
foo/jvm/Foo3Kt