From e401a98a2bf57342b623afeeac27df96f06d3b0f Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 15 Sep 2015 13:56:28 +0300 Subject: [PATCH] Replace `native` with `@native` in js testData --- ...closureThisByUsingMethodFromParentClass.kt | 14 +++---- .../testData/dynamic/_commonFiles/common.kt | 6 +-- js/js.translator/testData/dynamic/cases/is.kt | 2 +- .../testData/enum/cases/nativeEnum.kt | 2 +- .../function/_commonFiles/helpers.kt | 6 +-- .../expression/function/cases/mangling.kt | 42 +++++++++---------- .../function/cases/manglingStability.kt | 16 +++---- .../expression/misc/cases/elvisWithThrow.kt | 2 +- .../inheritance/cases/overrideAnyMethods.kt | 2 +- .../inline/cases/arrayLiteralAliasing.kt | 4 +- .../inlineMultiFile/_commonFiles/core.kt | 2 +- .../cases/tryCatch2/tryCatch2.2.kt | 2 +- .../testData/jsCode/cases/literal.kt | 2 +- .../testData/jsCode/cases/object.kt | 2 +- .../testData/jsCode/cases/objectScopes.kt | 2 +- .../testData/jsTester/jsTester.kt | 2 +- .../testData/native/cases/class.kt | 2 +- .../testData/native/cases/classObject.kt | 4 +- .../cases/inheritanceFromNativeClass.kt | 4 +- .../cases/inheritanceFromNativeTrait.kt | 4 +- .../testData/native/cases/kt1519.kt | 4 +- .../testData/native/cases/kt2209.kt | 8 ++-- .../testData/native/cases/kt2323.kt | 4 +- .../testData/native/cases/library.kt | 8 ++-- .../native/cases/nativeExtensionLikeMember.kt | 6 +-- .../cases/nativeGetterAndNativeSetter.kt | 20 ++++----- .../testData/native/cases/nativeInvoke.kt | 10 ++--- .../cases/nativePropertyWithCustomName.kt | 10 ++--- .../testData/native/cases/nestedElements.kt | 14 +++---- .../native/cases/passExtLambdaFromNative.kt | 4 +- .../native/cases/passExtLambdaToNative.kt | 4 +- .../native/cases/passMemberOrExtFromNative.kt | 6 +-- .../native/cases/passMemberOrExtToNative.kt | 2 +- .../cases/passTopLevelFunctionFromNative.kt | 2 +- .../passTopLevelOrLocalFunctionToNative.kt | 2 +- .../testData/native/cases/print.kt | 2 +- .../native/cases/secondaryConstructor.kt | 2 +- .../testData/native/cases/simple.kt | 2 +- .../testData/native/cases/simpleUndefined.kt | 2 +- .../testData/native/cases/vararg.kt | 22 +++++----- .../propertyAccess/cases/enumerable.kt | 6 +-- .../cases/nativePropertiesNameClashes.kt | 4 +- .../testData/regression/cases/kt2470.kt | 2 +- .../cases/hashMapTypeOfElement.kt | 2 +- .../cases/hashSetTypeOfElement.kt | 2 +- .../checkImplementationCharacteristics.kt | 2 +- 46 files changed, 137 insertions(+), 137 deletions(-) diff --git a/js/js.translator/testData/closure/cases/closureThisByUsingMethodFromParentClass.kt b/js/js.translator/testData/closure/cases/closureThisByUsingMethodFromParentClass.kt index 9dbe138c245..f8d7ddd32c5 100644 --- a/js/js.translator/testData/closure/cases/closureThisByUsingMethodFromParentClass.kt +++ b/js/js.translator/testData/closure/cases/closureThisByUsingMethodFromParentClass.kt @@ -2,16 +2,16 @@ package foo // HACKS -native +@native val ROOT = "Kotlin.modules.JS_TESTS" -native +@native val PATH_TO_F_CREATOR = "foo.B.far\$f" -native +@native val PATH_TO_G_CREATOR = "foo.B.gar\$f" -native("$ROOT.$PATH_TO_F_CREATOR") +@native("$ROOT.$PATH_TO_F_CREATOR") val F_CREATOR: Any = noImpl -native("$ROOT.$PATH_TO_G_CREATOR") +@native("$ROOT.$PATH_TO_G_CREATOR") val G_CREATOR: Any = noImpl @@ -48,10 +48,10 @@ fun box(): String { // Helpers -native +@native fun String.replace(regexp: RegExp, replacement: String): String = noImpl fun String.replaceAll(regexp: String, replacement: String): String = replace(RegExp(regexp, "g"), replacement) -native +@native class RegExp(regexp: String, flags: String) \ No newline at end of file diff --git a/js/js.translator/testData/dynamic/_commonFiles/common.kt b/js/js.translator/testData/dynamic/_commonFiles/common.kt index 88e4c91eea1..637584397aa 100644 --- a/js/js.translator/testData/dynamic/_commonFiles/common.kt +++ b/js/js.translator/testData/dynamic/_commonFiles/common.kt @@ -1,12 +1,12 @@ package foo -native +@native var bar: dynamic = noImpl -native +@native var arr: dynamic = noImpl -native +@native var baz: dynamic = noImpl object t { diff --git a/js/js.translator/testData/dynamic/cases/is.kt b/js/js.translator/testData/dynamic/cases/is.kt index be53434b22c..96e78405706 100644 --- a/js/js.translator/testData/dynamic/cases/is.kt +++ b/js/js.translator/testData/dynamic/cases/is.kt @@ -2,7 +2,7 @@ package foo class A -native +@native class B fun box(): String { diff --git a/js/js.translator/testData/enum/cases/nativeEnum.kt b/js/js.translator/testData/enum/cases/nativeEnum.kt index f9a08044c07..46bcc2f06b5 100644 --- a/js/js.translator/testData/enum/cases/nativeEnum.kt +++ b/js/js.translator/testData/enum/cases/nativeEnum.kt @@ -1,6 +1,6 @@ package foo -native +@native enum class JsEnum { Foo, Bar, diff --git a/js/js.translator/testData/expression/function/_commonFiles/helpers.kt b/js/js.translator/testData/expression/function/_commonFiles/helpers.kt index d5d357587e2..f2742c38b45 100644 --- a/js/js.translator/testData/expression/function/_commonFiles/helpers.kt +++ b/js/js.translator/testData/expression/function/_commonFiles/helpers.kt @@ -1,14 +1,14 @@ package foo -native +@native fun String.replace(regexp: RegExp, replacement: String): String = noImpl fun String.replaceAll(regexp: String, replacement: String): String = replace(RegExp(regexp, "g"), replacement) -native +@native fun String.search(regexp: RegExp): Int = noImpl -native +@native class RegExp(regexp: String, flags: String = "") { fun exec(s: String): Array? = noImpl } \ No newline at end of file diff --git a/js/js.translator/testData/expression/function/cases/mangling.kt b/js/js.translator/testData/expression/function/cases/mangling.kt index dc2925385d4..d150aabff6c 100644 --- a/js/js.translator/testData/expression/function/cases/mangling.kt +++ b/js/js.translator/testData/expression/function/cases/mangling.kt @@ -2,33 +2,33 @@ package foo public fun public_baz(i: Int) { } -native public fun public_baz(a: String) { +@native public fun public_baz(a: String) { } internal fun internal_baz(i: Int) { } -internal native fun internal_baz(a: String) { +internal @native fun internal_baz(a: String) { } private fun private_baz(i: Int) { } -native private fun private_baz(a: String) { +@native private fun private_baz(a: String) { } public class PublicClass { public fun public_baz(i: Int) { } - native public fun public_baz(a: String) { + @native public fun public_baz(a: String) { } internal fun internal_baz(i: Int) { } - native internal fun internal_baz(a: String) { + @native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { } - native private fun private_baz(a: String) { + @native private fun private_baz(a: String) { } val call_private_baz = { private_baz(0) } @@ -38,17 +38,17 @@ public class PublicClass { internal class InternalClass { public fun public_baz(i: Int) { } - native public fun public_baz(a: String) { + @native public fun public_baz(a: String) { } internal fun internal_baz(i: Int) { } - native internal fun internal_baz(a: String) { + @native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { } - native private fun private_baz(a: String) { + @native private fun private_baz(a: String) { } val call_private_baz = { private_baz(0) } @@ -58,17 +58,17 @@ internal class InternalClass { private class PrivateClass { public fun public_baz(i: Int) { } - native public fun public_baz(a: String) { + @native public fun public_baz(a: String) { } internal fun internal_baz(i: Int) { } - native internal fun internal_baz(a: String) { + @native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { } - native private fun private_baz(a: String) { + @native private fun private_baz(a: String) { } val call_private_baz = { private_baz(0) } @@ -78,17 +78,17 @@ private class PrivateClass { open public class OpenPublicClass { public fun public_baz(i: Int) { } - native public fun public_baz(a: String) { + @native public fun public_baz(a: String) { } internal fun internal_baz(i: Int) { } - native internal fun internal_baz(a: String) { + @native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { } - native private fun private_baz(a: String) { + @native private fun private_baz(a: String) { } val call_private_baz = { private_baz(0) } @@ -98,17 +98,17 @@ open public class OpenPublicClass { internal open class OpenInternalClass { public fun public_baz(i: Int) { } - native public fun public_baz(a: String) { + @native public fun public_baz(a: String) { } internal fun internal_baz(i: Int) { } - native internal fun internal_baz(a: String) { + @native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { } - native private fun private_baz(a: String) { + @native private fun private_baz(a: String) { } val call_private_baz = { private_baz(0) } @@ -118,17 +118,17 @@ internal open class OpenInternalClass { open private class OpenPrivateClass { public fun public_baz(i: Int) { } - native public fun public_baz(a: String) { + @native public fun public_baz(a: String) { } internal fun internal_baz(i: Int) { } - native internal fun internal_baz(a: String) { + @native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { } - native private fun private_baz(a: String) { + @native private fun private_baz(a: String) { } val call_private_baz = { private_baz(0) } diff --git a/js/js.translator/testData/expression/function/cases/manglingStability.kt b/js/js.translator/testData/expression/function/cases/manglingStability.kt index 7b22fbc03f2..c0411525b2e 100644 --- a/js/js.translator/testData/expression/function/cases/manglingStability.kt +++ b/js/js.translator/testData/expression/function/cases/manglingStability.kt @@ -1,36 +1,36 @@ package foo fun internal_foo(): Int = 1 -native fun internal_foo(a: Array) = "should be ignored" +@native fun internal_foo(a: Array) = "should be ignored" fun internal_foo(i: Int): Int = 2 fun internal_boo(i: Int): Int = 2 fun internal_boo(s: String): Int = 3 fun internal_boo(): Int = 1 -native fun internal_boo(a: Array) = "should be ignored" +@native fun internal_boo(a: Array) = "should be ignored" val internal_f = { internal_foo() + internal_foo(1) } val internal_b = { internal_boo() + internal_boo(1) } public fun public_foo(): Int = 1 -native public fun public_foo(a: Array): String = "should be ignored" +@native public fun public_foo(a: Array): String = "should be ignored" public fun public_foo(i: Int): Int = 2 public fun public_boo(i: Int): Int = 2 public fun public_boo(s: String): Int = 3 public fun public_boo(): Int = 1 -native public fun public_boo(a: Array): String = "should be ignored" +@native public fun public_boo(a: Array): String = "should be ignored" val public_f = { public_foo() + public_foo(1) } val public_b = { public_boo() + public_boo(1) } -native private fun private_foo(a: Array): String = "should be ignored" +@native private fun private_foo(a: Array): String = "should be ignored" private fun private_foo(): Int = 1 private fun private_foo(i: Int): Int = 2 -native private fun private_boo(a: Array): String = "should be ignored" +@native private fun private_boo(a: Array): String = "should be ignored" private fun private_boo(i: Int): Int = 2 private fun private_boo(s: String): Int = 3 private fun private_boo(): Int = 1 @@ -41,13 +41,13 @@ val private_b = { private_boo() + private_boo(1) } public fun mixed_foo(s: String): Int = 3 fun mixed_foo(): Int = 1 -native fun mixed_foo(a: Array) = "should be ignored" +@native fun mixed_foo(a: Array) = "should be ignored" private fun mixed_foo(s: String, i: Int): Int = 4 fun mixed_foo(i: Int): Int = 2 fun mixed_boo(i: Int): Int = 2 private fun mixed_boo(s: String, i: Int): Int = 4 -native fun mixed_boo(a: Array) = "should be ignored" +@native fun mixed_boo(a: Array) = "should be ignored" public fun mixed_boo(s: String): Int = 3 fun mixed_boo(): Int = 1 diff --git a/js/js.translator/testData/expression/misc/cases/elvisWithThrow.kt b/js/js.translator/testData/expression/misc/cases/elvisWithThrow.kt index 85395669b7e..88535165ee3 100644 --- a/js/js.translator/testData/expression/misc/cases/elvisWithThrow.kt +++ b/js/js.translator/testData/expression/misc/cases/elvisWithThrow.kt @@ -6,7 +6,7 @@ fun bar(): Any? { return null } -native +@native val Exception.message: String get() = noImpl fun box(): String { diff --git a/js/js.translator/testData/inheritance/cases/overrideAnyMethods.kt b/js/js.translator/testData/inheritance/cases/overrideAnyMethods.kt index f72785c9d7f..232d685c88d 100644 --- a/js/js.translator/testData/inheritance/cases/overrideAnyMethods.kt +++ b/js/js.translator/testData/inheritance/cases/overrideAnyMethods.kt @@ -1,6 +1,6 @@ package foo -native +@native fun String.charCodeAt(i: Int): Int = noImpl // Because String in JS doesn't have hashCode method diff --git a/js/js.translator/testData/inline/cases/arrayLiteralAliasing.kt b/js/js.translator/testData/inline/cases/arrayLiteralAliasing.kt index cdfb0b764eb..3f3b679f1dd 100644 --- a/js/js.translator/testData/inline/cases/arrayLiteralAliasing.kt +++ b/js/js.translator/testData/inline/cases/arrayLiteralAliasing.kt @@ -2,9 +2,9 @@ package foo // CHECK_NOT_CALLED: moveTo -native fun Array.push(element: Int): Unit = noImpl +@native fun Array.push(element: Int): Unit = noImpl -native fun Array.splice(index: Int, howMany: Int): Unit = noImpl +@native fun Array.splice(index: Int, howMany: Int): Unit = noImpl data class PairArray(val fst: Array, val snd: Array) diff --git a/js/js.translator/testData/inlineMultiFile/_commonFiles/core.kt b/js/js.translator/testData/inlineMultiFile/_commonFiles/core.kt index 32a66816683..a4e4b036a49 100644 --- a/js/js.translator/testData/inlineMultiFile/_commonFiles/core.kt +++ b/js/js.translator/testData/inlineMultiFile/_commonFiles/core.kt @@ -1 +1 @@ -native public fun parseInt(s: String, radix: Int = 10): Int = noImpl \ No newline at end of file +@native public fun parseInt(s: String, radix: Int = 10): Int = noImpl \ No newline at end of file diff --git a/js/js.translator/testData/inlineMultiFile/cases/tryCatch2/tryCatch2.2.kt b/js/js.translator/testData/inlineMultiFile/cases/tryCatch2/tryCatch2.2.kt index ad1968fb0b3..b305298e9b3 100644 --- a/js/js.translator/testData/inlineMultiFile/cases/tryCatch2/tryCatch2.2.kt +++ b/js/js.translator/testData/inlineMultiFile/cases/tryCatch2/tryCatch2.2.kt @@ -23,7 +23,7 @@ inline fun T.performWithFail2(job: (T)-> R, failJob: (e: RuntimeException } } -native object Number { +@native object Number { fun parseInt(str: String): Int = noImpl } diff --git a/js/js.translator/testData/jsCode/cases/literal.kt b/js/js.translator/testData/jsCode/cases/literal.kt index dcf17185f96..d3a59c6cf4c 100644 --- a/js/js.translator/testData/jsCode/cases/literal.kt +++ b/js/js.translator/testData/jsCode/cases/literal.kt @@ -1,6 +1,6 @@ package foo -native trait HasName { +@native trait HasName { val name: String } diff --git a/js/js.translator/testData/jsCode/cases/object.kt b/js/js.translator/testData/jsCode/cases/object.kt index 1328c101b6f..41320e22eb0 100644 --- a/js/js.translator/testData/jsCode/cases/object.kt +++ b/js/js.translator/testData/jsCode/cases/object.kt @@ -1,6 +1,6 @@ package foo -native trait Summizer { +@native trait Summizer { fun sum(a: Int, b: Int): Int } diff --git a/js/js.translator/testData/jsCode/cases/objectScopes.kt b/js/js.translator/testData/jsCode/cases/objectScopes.kt index ec8ea9ffc90..3947ab6377a 100644 --- a/js/js.translator/testData/jsCode/cases/objectScopes.kt +++ b/js/js.translator/testData/jsCode/cases/objectScopes.kt @@ -1,6 +1,6 @@ package foo -native trait Summizer { +@native trait Summizer { fun sum(a: Int, b: Int): Int } diff --git a/js/js.translator/testData/jsTester/jsTester.kt b/js/js.translator/testData/jsTester/jsTester.kt index 625a79d6584..badbeaa6c21 100644 --- a/js/js.translator/testData/jsTester/jsTester.kt +++ b/js/js.translator/testData/jsTester/jsTester.kt @@ -12,5 +12,5 @@ public class JsTestsAsserter() : Asserter { } } -native("JsTests.assert") +@native("JsTests.assert") public fun assert(value: Boolean, message: String?): Unit = noImpl diff --git a/js/js.translator/testData/native/cases/class.kt b/js/js.translator/testData/native/cases/class.kt index eea8db49f41..8acc9a8c599 100644 --- a/js/js.translator/testData/native/cases/class.kt +++ b/js/js.translator/testData/native/cases/class.kt @@ -1,6 +1,6 @@ package foo -native +@native class A(b: Int) { fun g(): Int = noImpl fun m(): Int = noImpl diff --git a/js/js.translator/testData/native/cases/classObject.kt b/js/js.translator/testData/native/cases/classObject.kt index 6ef46be3a05..e7ae992f02c 100644 --- a/js/js.translator/testData/native/cases/classObject.kt +++ b/js/js.translator/testData/native/cases/classObject.kt @@ -1,8 +1,8 @@ package foo -native +@native class A(val c: Int) { - native + @native companion object { val g: Int = noImpl val c: String = noImpl diff --git a/js/js.translator/testData/native/cases/inheritanceFromNativeClass.kt b/js/js.translator/testData/native/cases/inheritanceFromNativeClass.kt index 6813d18a00d..a8760a790b2 100644 --- a/js/js.translator/testData/native/cases/inheritanceFromNativeClass.kt +++ b/js/js.translator/testData/native/cases/inheritanceFromNativeClass.kt @@ -1,13 +1,13 @@ package foo -native +@native internal open class A(val a: Int) { fun g(): Int = noImpl fun m(): Int = noImpl public open fun foo(i: Int): String = noImpl public fun boo(i: Int): String = noImpl - native("bar") + @native("bar") open fun baz(i: Int): String = noImpl } diff --git a/js/js.translator/testData/native/cases/inheritanceFromNativeTrait.kt b/js/js.translator/testData/native/cases/inheritanceFromNativeTrait.kt index df4a5e66e0a..56f3e428c5f 100644 --- a/js/js.translator/testData/native/cases/inheritanceFromNativeTrait.kt +++ b/js/js.translator/testData/native/cases/inheritanceFromNativeTrait.kt @@ -1,11 +1,11 @@ package foo -native +@native trait NativeTrait { val foo: String fun bar(a: Int): Any - native("boo") + @native("boo") fun baz(): String } diff --git a/js/js.translator/testData/native/cases/kt1519.kt b/js/js.translator/testData/native/cases/kt1519.kt index 2df1586d189..e7ce3fba94e 100644 --- a/js/js.translator/testData/native/cases/kt1519.kt +++ b/js/js.translator/testData/native/cases/kt1519.kt @@ -1,12 +1,12 @@ package foo -native +@native class Wow() { val x: Int = noImpl val y: Int = noImpl } -native +@native fun Wow.sum(): Int = noImpl fun Wow.dblSum(): Int { diff --git a/js/js.translator/testData/native/cases/kt2209.kt b/js/js.translator/testData/native/cases/kt2209.kt index 8b7c5222eb4..b98013b5b54 100644 --- a/js/js.translator/testData/native/cases/kt2209.kt +++ b/js/js.translator/testData/native/cases/kt2209.kt @@ -1,21 +1,21 @@ package foo -native +@native trait Chrome { val extension: Extension } -native +@native trait Extension { val lastError: LastError? } -native +@native trait LastError { val message: String } -native +@native val chrome: Chrome = noImpl fun box(): Boolean { diff --git a/js/js.translator/testData/native/cases/kt2323.kt b/js/js.translator/testData/native/cases/kt2323.kt index 1482ffaffab..14568c788e8 100644 --- a/js/js.translator/testData/native/cases/kt2323.kt +++ b/js/js.translator/testData/native/cases/kt2323.kt @@ -2,9 +2,9 @@ package foo import java.util.HashMap -native +@native val classes: Map = noImpl -native +@native val classesMutable: HashMap = noImpl fun box(): Boolean { diff --git a/js/js.translator/testData/native/cases/library.kt b/js/js.translator/testData/native/cases/library.kt index 756e5fcac5e..3d00ac49a67 100644 --- a/js/js.translator/testData/native/cases/library.kt +++ b/js/js.translator/testData/native/cases/library.kt @@ -1,13 +1,13 @@ package foo -library class A() { - library fun f() { +@library class A() { + @library fun f() { } - library fun f(a: Int) { + @library fun f(a: Int) { } } -library fun getResult() = false +@library fun getResult() = false fun box(): Boolean { val a = A() diff --git a/js/js.translator/testData/native/cases/nativeExtensionLikeMember.kt b/js/js.translator/testData/native/cases/nativeExtensionLikeMember.kt index 956da932d1f..65025902607 100644 --- a/js/js.translator/testData/native/cases/nativeExtensionLikeMember.kt +++ b/js/js.translator/testData/native/cases/nativeExtensionLikeMember.kt @@ -1,6 +1,6 @@ package foo -native +@native open class A(val value: String) { } @@ -9,9 +9,9 @@ class B : A("B") { var prop: String = "B prop" } -native fun A.bar(): String = noImpl +@native fun A.bar(): String = noImpl -native var A.prop: String +@native var A.prop: String get() = noImpl set(value) = noImpl diff --git a/js/js.translator/testData/native/cases/nativeGetterAndNativeSetter.kt b/js/js.translator/testData/native/cases/nativeGetterAndNativeSetter.kt index 7bfd9f2df45..fb91d262fef 100644 --- a/js/js.translator/testData/native/cases/nativeGetterAndNativeSetter.kt +++ b/js/js.translator/testData/native/cases/nativeGetterAndNativeSetter.kt @@ -1,36 +1,36 @@ package foo -native("Object") +@native("Object") class JsObject { - nativeGetter + @nativeGetter fun get(a: String): Any? = noImpl - nativeSetter + @nativeSetter fun set(a: String, v: Any?): Unit = noImpl - nativeGetter + @nativeGetter fun take(a: Int): Any? = noImpl - nativeSetter + @nativeSetter fun put(a: Int, v: Any?): Unit = noImpl } -nativeGetter +@nativeGetter fun JsObject.get(a: Int): Any? = noImpl -nativeSetter +@nativeSetter fun JsObject.set(a: Int, v: Any?): Unit = noImpl -nativeGetter +@nativeGetter fun JsObject.take(a: String): Any? = noImpl -nativeSetter +@nativeSetter fun JsObject.put(a: String, v: Any?): Unit = noImpl object t{} -native +@native fun getTestObject(): JsObject = noImpl fun test(obj: JsObject, key: String, oldValue: Any?, newValue: Any) { diff --git a/js/js.translator/testData/native/cases/nativeInvoke.kt b/js/js.translator/testData/native/cases/nativeInvoke.kt index 57bbbc26a65..d9bc7c960cc 100644 --- a/js/js.translator/testData/native/cases/nativeInvoke.kt +++ b/js/js.translator/testData/native/cases/nativeInvoke.kt @@ -1,18 +1,18 @@ package foo -native +@native class Function(vararg argsAndCode: String) { - nativeInvoke + @nativeInvoke fun invoke(a: Any?): Any? = noImpl - nativeInvoke + @nativeInvoke fun baz(a: Any?, b: Any?): Any? = noImpl } -nativeInvoke +@nativeInvoke fun Function.invoke(a: Any?, b: Any?): Any? = noImpl -nativeInvoke +@nativeInvoke fun Function.bar(a: Any?, b: Any?): Any? = noImpl object t{} diff --git a/js/js.translator/testData/native/cases/nativePropertyWithCustomName.kt b/js/js.translator/testData/native/cases/nativePropertyWithCustomName.kt index d711138dd66..f823ddf3fd0 100644 --- a/js/js.translator/testData/native/cases/nativePropertyWithCustomName.kt +++ b/js/js.translator/testData/native/cases/nativePropertyWithCustomName.kt @@ -4,14 +4,14 @@ internal val PACKAGE = "Kotlin.modules.JS_TESTS.foo" internal fun funToString(name: String) = eval("$PACKAGE.$name.toString()") as String -internal native("\"O\"") val foo: String = noImpl -internal native("boo") val bar: String = noImpl +internal @native("\"O\"") val foo: String = noImpl +internal @native("boo") val bar: String = noImpl internal class A -internal native("__proto__") val Any.proto: String get() = noImpl -internal native("__proto__") val A.proto: String get() = noImpl +internal @native("__proto__") val Any.proto: String get() = noImpl +internal @native("__proto__") val A.proto: String get() = noImpl -internal fun actual(foo: String, native("boo") bar: String) = foo + bar +internal fun actual(foo: String, @native("boo") bar: String) = foo + bar internal fun expected(foo: String, boo: String) = foo + boo fun box(): String { diff --git a/js/js.translator/testData/native/cases/nestedElements.kt b/js/js.translator/testData/native/cases/nestedElements.kt index 705a6976754..8d4893c74ce 100644 --- a/js/js.translator/testData/native/cases/nestedElements.kt +++ b/js/js.translator/testData/native/cases/nestedElements.kt @@ -85,14 +85,14 @@ fun box(): String { return "OK"; } -native +@native object Object { object Object { val a: String = noImpl var b: String = noImpl fun test(): Int = noImpl - native("AnotherClass") + @native("AnotherClass") class Class(val a: String) { var b: String = noImpl fun test(): Int = noImpl @@ -133,7 +133,7 @@ object Object { fun test(): Int = noImpl } -native("SomeClass") +@native("SomeClass") class Class { object Object { val a: String = noImpl @@ -170,16 +170,16 @@ class Class { } companion object { - native("aaa") + @native("aaa") val a: Trait = noImpl var b: String = noImpl fun test(): Int = noImpl } } -native +@native trait Trait { - native("SomeObject") + @native("SomeObject") object Object { val a: String = noImpl var b: String = noImpl @@ -197,7 +197,7 @@ trait Trait { } } - native("SomeTrait") + @native("SomeTrait") trait Trait { val a: String var b: String diff --git a/js/js.translator/testData/native/cases/passExtLambdaFromNative.kt b/js/js.translator/testData/native/cases/passExtLambdaFromNative.kt index 237413dcc5f..0fd31650dd7 100644 --- a/js/js.translator/testData/native/cases/passExtLambdaFromNative.kt +++ b/js/js.translator/testData/native/cases/passExtLambdaFromNative.kt @@ -1,13 +1,13 @@ package foo -native +@native internal class A(val v: String) internal class B { fun bar(a: A, extLambda: A.(Int, String) -> String): String = a.extLambda(7, "_rr_") } -native +@native internal fun nativeBox(b: B): String = noImpl fun box(): String { diff --git a/js/js.translator/testData/native/cases/passExtLambdaToNative.kt b/js/js.translator/testData/native/cases/passExtLambdaToNative.kt index 1085a9a6551..6529d9cd759 100644 --- a/js/js.translator/testData/native/cases/passExtLambdaToNative.kt +++ b/js/js.translator/testData/native/cases/passExtLambdaToNative.kt @@ -1,9 +1,9 @@ package foo -native +@native class A(val v: String) -native +@native fun bar(a: A, extLambda: A.(Int, String) -> String): String = noImpl fun box(): String { diff --git a/js/js.translator/testData/native/cases/passMemberOrExtFromNative.kt b/js/js.translator/testData/native/cases/passMemberOrExtFromNative.kt index fb70ffbc1b2..62437c67d40 100644 --- a/js/js.translator/testData/native/cases/passMemberOrExtFromNative.kt +++ b/js/js.translator/testData/native/cases/passMemberOrExtFromNative.kt @@ -1,13 +1,13 @@ package foo -native +@native class A(val v: String) { fun m(i:Int, s:String): String = noImpl } -native +@native fun A.nativeExt(i:Int, s:String): String = noImpl -native("nativeExt2AnotherName") +@native("nativeExt2AnotherName") fun A.nativeExt2(i:Int, s:String): String = noImpl fun bar(a: A, extLambda: A.(Int, String) -> String): String = a.(extLambda)(4, "boo") diff --git a/js/js.translator/testData/native/cases/passMemberOrExtToNative.kt b/js/js.translator/testData/native/cases/passMemberOrExtToNative.kt index 57c1f0e0e5d..7923ce92fe6 100644 --- a/js/js.translator/testData/native/cases/passMemberOrExtToNative.kt +++ b/js/js.translator/testData/native/cases/passMemberOrExtToNative.kt @@ -8,7 +8,7 @@ class B(v: String): A(v) { override fun m(i:Int, s:String): String = "B.m ${this.v} $i $s" } -native +@native fun bar(a: A, extLambda: A.(Int, String) -> String): String = noImpl fun A.topLevelExt(i:Int, s:String): String = "A::topLevelExt ${this.v} $i $s" diff --git a/js/js.translator/testData/native/cases/passTopLevelFunctionFromNative.kt b/js/js.translator/testData/native/cases/passTopLevelFunctionFromNative.kt index 905fbec497c..2719891d499 100644 --- a/js/js.translator/testData/native/cases/passTopLevelFunctionFromNative.kt +++ b/js/js.translator/testData/native/cases/passTopLevelFunctionFromNative.kt @@ -1,6 +1,6 @@ package foo -native +@native fun nativeFun(i:Int, s:String): String = noImpl fun bar(funRef: (Int, String) -> String): String = funRef(4, "boo") diff --git a/js/js.translator/testData/native/cases/passTopLevelOrLocalFunctionToNative.kt b/js/js.translator/testData/native/cases/passTopLevelOrLocalFunctionToNative.kt index f7b23bb0a5b..942e165898e 100644 --- a/js/js.translator/testData/native/cases/passTopLevelOrLocalFunctionToNative.kt +++ b/js/js.translator/testData/native/cases/passTopLevelOrLocalFunctionToNative.kt @@ -1,6 +1,6 @@ package foo -native +@native fun run(i:Int, s:String, funRef: (Int, String) -> String): String = noImpl fun funTopLevel(i:Int, s:String): String = "funTopLevel $i $s" diff --git a/js/js.translator/testData/native/cases/print.kt b/js/js.translator/testData/native/cases/print.kt index 94bc44edc20..464a51cdd58 100644 --- a/js/js.translator/testData/native/cases/print.kt +++ b/js/js.translator/testData/native/cases/print.kt @@ -17,7 +17,7 @@ val EXPECTED_NEWLINE_FOR_EACH = """Hello """ -native +@native var buffer: String = noImpl fun test(expected: String, initCode: String, getResult: () -> String) { diff --git a/js/js.translator/testData/native/cases/secondaryConstructor.kt b/js/js.translator/testData/native/cases/secondaryConstructor.kt index 49d81a6e2c0..63720361f09 100644 --- a/js/js.translator/testData/native/cases/secondaryConstructor.kt +++ b/js/js.translator/testData/native/cases/secondaryConstructor.kt @@ -1,6 +1,6 @@ package foo -native +@native class A { constructor() constructor(s: String) diff --git a/js/js.translator/testData/native/cases/simple.kt b/js/js.translator/testData/native/cases/simple.kt index a18a3f5cee5..97c3895279c 100644 --- a/js/js.translator/testData/native/cases/simple.kt +++ b/js/js.translator/testData/native/cases/simple.kt @@ -1,6 +1,6 @@ package foo -native +@native fun returnFalse(): Boolean = noImpl fun box() = !returnFalse() diff --git a/js/js.translator/testData/native/cases/simpleUndefined.kt b/js/js.translator/testData/native/cases/simpleUndefined.kt index 8b37a9164a2..0ed89a2f354 100644 --- a/js/js.translator/testData/native/cases/simpleUndefined.kt +++ b/js/js.translator/testData/native/cases/simpleUndefined.kt @@ -1,6 +1,6 @@ package foo -native +@native val c: Any? = noImpl fun box(): Boolean { diff --git a/js/js.translator/testData/native/cases/vararg.kt b/js/js.translator/testData/native/cases/vararg.kt index 0a1dd160999..277348c77de 100644 --- a/js/js.translator/testData/native/cases/vararg.kt +++ b/js/js.translator/testData/native/cases/vararg.kt @@ -1,12 +1,12 @@ package foo -native +@native fun paramCount(vararg a: Int): Int = noImpl -native("paramCount") +@native("paramCount") fun anotherParamCount(vararg a: Int): Int = noImpl -native("paramCount") +@native("paramCount") fun genericParamCount(vararg a: T): Int = noImpl // test spread operator @@ -15,13 +15,13 @@ fun count(vararg a: Int) = paramCount(*a) // test spread operator fun anotherCount(vararg a: Int) = anotherParamCount(*a) -native +@native fun test3(bar: Bar, dummy: Int, vararg args: Int): Boolean = noImpl -native +@native fun Bar.test2(order: Int, dummy: Int, vararg args: Int): Boolean = noImpl -native +@native class Bar(val size: Int, order: Int = 0) { fun test(order: Int, dummy: Int, vararg args: Int): Boolean = noImpl companion object { @@ -30,7 +30,7 @@ class Bar(val size: Int, order: Int = 0) { } } -native +@native object obj { fun test(size: Int, vararg args: Int): Boolean = noImpl } @@ -43,7 +43,7 @@ fun spreadInMethodCallWithReceiver(size: Int, vararg args: Int) = Bar(size).test fun spreadInPackageMethodCall(size: Int, vararg args: Int) = test3(Bar(size), 1, *args) -native +@native fun testNativeVarargWithFunLit(vararg args: Int, f: (a: IntArray) -> Boolean): Boolean = noImpl fun testSpreadOperatorWithSafeCall(a: Bar?, expected: Boolean?, vararg args: Int): Boolean { @@ -59,13 +59,13 @@ fun testCallOrder(vararg args: Int) = Bar(args.size, 0).test(1, 1, *args) && Bar(args.size, 2).test(3, 1, *args) && !Bar.hasOrderProblem -native +@native fun sumOfParameters(x: Int, y: Int, vararg a: Int): Int = noImpl -native +@native fun sumFunValuesOnParameters(x: Int, y: Int, vararg a: Int, f: (Int) -> Int): Int = noImpl -native +@native fun idArrayVarArg(vararg a: Array): Array = noImpl fun box(): String { diff --git a/js/js.translator/testData/propertyAccess/cases/enumerable.kt b/js/js.translator/testData/propertyAccess/cases/enumerable.kt index 50644d23f60..6e13b4e3abd 100644 --- a/js/js.translator/testData/propertyAccess/cases/enumerable.kt +++ b/js/js.translator/testData/propertyAccess/cases/enumerable.kt @@ -1,9 +1,9 @@ package foo -native +@native fun _enumerate(o: T): T = noImpl -native +@native fun _findFirst(o: Any): T = noImpl class Test() { @@ -12,7 +12,7 @@ class Test() { } class P() { - enumerable + @enumerable val a: Int = 100 val b: String = "s" } diff --git a/js/js.translator/testData/propertyAccess/cases/nativePropertiesNameClashes.kt b/js/js.translator/testData/propertyAccess/cases/nativePropertiesNameClashes.kt index 93445b4c01f..e4daf321568 100644 --- a/js/js.translator/testData/propertyAccess/cases/nativePropertiesNameClashes.kt +++ b/js/js.translator/testData/propertyAccess/cases/nativePropertiesNameClashes.kt @@ -3,8 +3,8 @@ package foo val PACKAGE = "Kotlin.modules.JS_TESTS.foo" class A -native val Any.__proto__: String get() = noImpl -native val A.__proto__: String get() = noImpl +@native val Any.__proto__: String get() = noImpl +@native val A.__proto__: String get() = noImpl fun box(): String { val a = A() diff --git a/js/js.translator/testData/regression/cases/kt2470.kt b/js/js.translator/testData/regression/cases/kt2470.kt index 32ae36a11f5..c1bec7625d8 100644 --- a/js/js.translator/testData/regression/cases/kt2470.kt +++ b/js/js.translator/testData/regression/cases/kt2470.kt @@ -2,7 +2,7 @@ package foo -native val Exception.message: String get() = noImpl +@native val Exception.message: String get() = noImpl public fun failsWith(block: () -> Any): T { try { diff --git a/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt b/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt index 961b3f32b2d..070629d3f94 100644 --- a/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt +++ b/js/js.translator/testData/standardClasses/cases/hashMapTypeOfElement.kt @@ -2,7 +2,7 @@ package foo import java.util.HashMap -native fun typeof(a: Any): String = noImpl +@native fun typeof(a: Any): String = noImpl fun box(): String { diff --git a/js/js.translator/testData/standardClasses/cases/hashSetTypeOfElement.kt b/js/js.translator/testData/standardClasses/cases/hashSetTypeOfElement.kt index ff1f87e7642..8c5f3875a76 100644 --- a/js/js.translator/testData/standardClasses/cases/hashSetTypeOfElement.kt +++ b/js/js.translator/testData/standardClasses/cases/hashSetTypeOfElement.kt @@ -2,7 +2,7 @@ package foo import java.util.HashSet -native fun typeof(a: Any): String = noImpl +@native fun typeof(a: Any): String = noImpl fun box(): String { diff --git a/js/js.translator/testData/trait/cases/checkImplementationCharacteristics.kt b/js/js.translator/testData/trait/cases/checkImplementationCharacteristics.kt index 58478429ecc..8f1476bba22 100644 --- a/js/js.translator/testData/trait/cases/checkImplementationCharacteristics.kt +++ b/js/js.translator/testData/trait/cases/checkImplementationCharacteristics.kt @@ -9,7 +9,7 @@ public trait B : A { } } -native class Function(vararg args: String) +@native class Function(vararg args: String) val hasProp = Function("obj, prop", "return obj[prop] !== undefined") as ((Any, String) -> Boolean)