From f6892580f651b27bb17e2b3e3e09a74fd8aebeaa Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 7 Sep 2015 22:21:52 +0300 Subject: [PATCH] fix tests in org.jetbrains.kotlin.js.test.semantics --- .../expression/function/cases/mangling.kt | 32 +++++++++---------- .../cases/manglingClashFunctionsAndClasses.kt | 12 +++---- .../inline/cases/callableReference.kt | 10 +++--- .../cases/expressionBodyWithLambdaCall.kt | 4 +-- .../cases/extensionWithManyArguments.kt | 6 ++-- .../testData/inline/cases/inlineChain.kt | 8 ++--- .../cases/inlineChainWithFewStatements.kt | 8 ++--- .../inline/cases/inlineDefaultArgument.kt | 6 ++-- .../inline/cases/inlineFunctionInLambda.kt | 6 ++-- .../inline/cases/inlineGenericSimple.kt | 6 ++-- .../testData/inline/cases/inlineInc.kt | 4 +-- .../testData/inline/cases/inlineIntSimple.kt | 8 ++--- .../inline/cases/inlineLambdaNoCapture.kt | 4 +-- .../inline/cases/inlineLambdaWithCapture.kt | 6 ++-- .../testData/inline/cases/inlineMethod.kt | 4 +-- .../testData/inline/cases/inlineNoReturn.kt | 12 +++---- .../testData/inline/cases/jsCode.kt | 4 +-- .../inline/cases/jsCodeVarDeclared.kt | 4 +-- .../testData/inline/cases/lambdaInLambda.kt | 4 +-- .../cases/localInlineExtensionFunction.kt | 8 ++--- .../inline/cases/localInlineFunction.kt | 6 ++-- .../cases/localInlineFunctionComplex.kt | 6 ++-- .../localInlineFunctionDeclaredInLambda.kt | 6 ++-- .../cases/localInlineFunctionNameClash.kt | 4 +-- .../inline/cases/metadataForPublicFunction.kt | 10 +++--- .../testData/inline/cases/noInlineLambda.kt | 4 +-- .../testData/inline/cases/vararg.kt | 8 ++--- .../inlineMultiFile/cases/trait/trait.1.kt | 6 ++-- .../inlineMultiFile/cases/trait/trait.2.kt | 6 ++-- .../anotherModuleValInClosure/main/main.kt | 2 +- .../cases/callableReference/main/main.kt | 4 +-- .../cases/calledByFqName/main/main.kt | 2 +- .../cases/extensionLambda/main/main.kt | 4 +-- .../cases/lambda/main/main.kt | 2 +- .../lambdaCalledInObjectLiteral/main/main.kt | 2 +- .../cases/lambdaWithClosure/main/main.kt | 2 +- .../cases/localNameClash/main/main.kt | 2 +- .../cases/method/main/main.kt | 2 +- .../cases/simple/main/main.kt | 2 +- .../inlineSizeReduction/cases/lastBreak.kt | 10 +++--- .../cases/oneTopLevelReturn.kt | 10 +++--- .../cases/returnInlineCall.kt | 4 +-- .../cases/simpleReturnFunction.kt | 4 +-- .../inlineSizeReduction/cases/this.kt | 4 +-- .../cases/valAssignment.kt | 4 +-- .../cases/valDeclaration.kt | 4 +-- .../cases/callableRefToFunInCurrentModule.kt | 4 +-- .../testData/inlineStdlib/cases/closure.kt | 2 +- .../inlineStdlib/cases/closureNested.kt | 2 +- .../inlineStdlib/cases/localNamesClash.kt | 2 +- .../testData/inlineStdlib/cases/simple.kt | 4 +-- .../inlineStdlib/cases/thisInExtension.kt | 6 ++-- .../cases/nestedLabelsInlinedClashing.kt | 8 ++--- ...lsInlinedClashingAtFunctionsWithClosure.kt | 2 +- .../cases/inheritanceFromNativeClass.kt | 4 +-- .../cases/nativePropertyWithCustomName.kt | 18 +++++------ .../native/cases/passExtLambdaFromNative.kt | 6 ++-- 57 files changed, 167 insertions(+), 167 deletions(-) diff --git a/js/js.translator/testData/expression/function/cases/mangling.kt b/js/js.translator/testData/expression/function/cases/mangling.kt index a3225faedf7..dc2925385d4 100644 --- a/js/js.translator/testData/expression/function/cases/mangling.kt +++ b/js/js.translator/testData/expression/function/cases/mangling.kt @@ -5,9 +5,9 @@ public fun public_baz(i: Int) { native public fun public_baz(a: String) { } -fun internal_baz(i: Int) { +internal fun internal_baz(i: Int) { } -native fun internal_baz(a: String) { +internal native fun internal_baz(a: String) { } private fun private_baz(i: Int) { @@ -21,9 +21,9 @@ public class PublicClass { native public fun public_baz(a: String) { } - fun internal_baz(i: Int) { + internal fun internal_baz(i: Int) { } - native fun internal_baz(a: String) { + native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { @@ -35,15 +35,15 @@ public class PublicClass { val call_private_native_baz = { private_baz("native") } } -class InternalClass { +internal class InternalClass { public fun public_baz(i: Int) { } native public fun public_baz(a: String) { } - fun internal_baz(i: Int) { + internal fun internal_baz(i: Int) { } - native fun internal_baz(a: String) { + native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { @@ -61,9 +61,9 @@ private class PrivateClass { native public fun public_baz(a: String) { } - fun internal_baz(i: Int) { + internal fun internal_baz(i: Int) { } - native fun internal_baz(a: String) { + native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { @@ -81,9 +81,9 @@ open public class OpenPublicClass { native public fun public_baz(a: String) { } - fun internal_baz(i: Int) { + internal fun internal_baz(i: Int) { } - native fun internal_baz(a: String) { + native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { @@ -95,15 +95,15 @@ open public class OpenPublicClass { val call_private_native_baz = { private_baz("native") } } -open class OpenInternalClass { +internal open class OpenInternalClass { public fun public_baz(i: Int) { } native public fun public_baz(a: String) { } - fun internal_baz(i: Int) { + internal fun internal_baz(i: Int) { } - native fun internal_baz(a: String) { + native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { @@ -121,9 +121,9 @@ open private class OpenPrivateClass { native public fun public_baz(a: String) { } - fun internal_baz(i: Int) { + internal fun internal_baz(i: Int) { } - native fun internal_baz(a: String) { + native internal fun internal_baz(a: String) { } private fun private_baz(i: Int) { diff --git a/js/js.translator/testData/expression/function/cases/manglingClashFunctionsAndClasses.kt b/js/js.translator/testData/expression/function/cases/manglingClashFunctionsAndClasses.kt index 372b4fa216a..b3352dc8e24 100644 --- a/js/js.translator/testData/expression/function/cases/manglingClashFunctionsAndClasses.kt +++ b/js/js.translator/testData/expression/function/cases/manglingClashFunctionsAndClasses.kt @@ -2,29 +2,29 @@ package foo public class A -fun A(a: Int){} +internal fun A(a: Int){} public class B(a: Int) -fun B(){} +internal fun B(){} -fun C(a: Int){} +internal fun C(a: Int){} public class C -fun D(){} +internal fun D(){} public class D(a: Int) //Testing -fun testClass(name: String, f: () -> Unit) { +internal fun testClass(name: String, f: () -> Unit) { val fs = f.toString() if ("$name(" !in fs) throw Exception("Name of class '$name' unexpectedly mangled: $fs") } -fun testFun(name: String, f: () -> Unit) { +internal fun testFun(name: String, f: () -> Unit) { val fs = f.toString() if ("$name(" in fs) throw Exception("Name of fun '$name' unexpectedly not mangled: $fs") diff --git a/js/js.translator/testData/inline/cases/callableReference.kt b/js/js.translator/testData/inline/cases/callableReference.kt index 01e9e6e2c92..e491082861d 100644 --- a/js/js.translator/testData/inline/cases/callableReference.kt +++ b/js/js.translator/testData/inline/cases/callableReference.kt @@ -3,16 +3,16 @@ package foo // CHECK_CONTAINS_NO_CALLS: multiplyInline // CHECK_NOT_CALLED: runNoinline -inline fun multiply(a: Int, b: Int) = a * b +internal inline fun multiply(a: Int, b: Int) = a * b -inline fun run(a: Int, b: Int, func: (Int, Int) -> Int) = func(a, b) +internal inline fun run(a: Int, b: Int, func: (Int, Int) -> Int) = func(a, b) -fun multiplyInline(a: Int, b: Int) = run(a, b, ::multiply) +internal fun multiplyInline(a: Int, b: Int) = run(a, b, ::multiply) -inline fun runNoinline(a: Int, b: Int, noinline func: (Int, Int) -> Int) = func(a, b) +internal inline fun runNoinline(a: Int, b: Int, noinline func: (Int, Int) -> Int) = func(a, b) -fun multiplyNoinline(a: Int, b: Int) = runNoinline(a, b, ::multiply) +internal fun multiplyNoinline(a: Int, b: Int) = runNoinline(a, b, ::multiply) fun box(): String { diff --git a/js/js.translator/testData/inline/cases/expressionBodyWithLambdaCall.kt b/js/js.translator/testData/inline/cases/expressionBodyWithLambdaCall.kt index b40ef49558e..926faab5e6b 100644 --- a/js/js.translator/testData/inline/cases/expressionBodyWithLambdaCall.kt +++ b/js/js.translator/testData/inline/cases/expressionBodyWithLambdaCall.kt @@ -5,9 +5,9 @@ package foo // A copy of stdlib run function. // Copied to not to depend on run implementation. // It's important, that the body is just `return fn()`. -inline fun evaluate(fn: ()->T): T = fn() +internal inline fun evaluate(fn: ()->T): T = fn() -fun test(n: Int): Int { +internal fun test(n: Int): Int { return evaluate { var i = n var sum = 0 diff --git a/js/js.translator/testData/inline/cases/extensionWithManyArguments.kt b/js/js.translator/testData/inline/cases/extensionWithManyArguments.kt index 8b71e60cbc4..46758465e72 100644 --- a/js/js.translator/testData/inline/cases/extensionWithManyArguments.kt +++ b/js/js.translator/testData/inline/cases/extensionWithManyArguments.kt @@ -2,11 +2,11 @@ package foo // CHECK_NOT_CALLED_IN_SCOPE: scope=multiply function=multiply$f -class A(val a: Int) +internal class A(val a: Int) -inline fun with2(receiver: T, arg1: R, arg2: R, f: T.(R, R) -> R): R = receiver.f(arg1, arg2) +internal inline fun with2(receiver: T, arg1: R, arg2: R, f: T.(R, R) -> R): R = receiver.f(arg1, arg2) -fun multiply(a: Int, b: Int, c: Int): Int = with2(A(a), b, c) { x, y -> a*x*y } +internal fun multiply(a: Int, b: Int, c: Int): Int = with2(A(a), b, c) { x, y -> a*x*y } fun box(): String { assertEquals(105, multiply(3, 5, 7)) diff --git a/js/js.translator/testData/inline/cases/inlineChain.kt b/js/js.translator/testData/inline/cases/inlineChain.kt index 2b7d7c96496..03a0275c305 100644 --- a/js/js.translator/testData/inline/cases/inlineChain.kt +++ b/js/js.translator/testData/inline/cases/inlineChain.kt @@ -2,19 +2,19 @@ package foo // CHECK_CONTAINS_NO_CALLS: squareMultipliedByTwo -inline fun inline1(a: Int): Int { +internal inline fun inline1(a: Int): Int { return a } -inline fun inline2(a: Int): Int { +internal inline fun inline2(a: Int): Int { return inline1(a) + inline1(a) } -inline fun inline3(a: Int): Int { +internal inline fun inline3(a: Int): Int { return inline1(a) * inline2(a) } -fun squareMultipliedByTwo(a: Int): Int { +internal fun squareMultipliedByTwo(a: Int): Int { return inline3(a) } diff --git a/js/js.translator/testData/inline/cases/inlineChainWithFewStatements.kt b/js/js.translator/testData/inline/cases/inlineChainWithFewStatements.kt index 10a73feea22..01d4c501dde 100644 --- a/js/js.translator/testData/inline/cases/inlineChainWithFewStatements.kt +++ b/js/js.translator/testData/inline/cases/inlineChainWithFewStatements.kt @@ -2,24 +2,24 @@ package foo // CHECK_CONTAINS_NO_CALLS: squareMultipliedByTwo -inline fun inline1(a: Int): Int { +internal inline fun inline1(a: Int): Int { return a } -inline fun inline2(a: Int): Int { +internal inline fun inline2(a: Int): Int { val a1 = inline1(a) if (a1 == 0) return 0 return a1 + inline1(a) } -inline fun inline3(a: Int): Int { +internal inline fun inline3(a: Int): Int { val i = inline2(a) val i1 = inline1(a) * i if (i == i1) return 0 return i1 } -fun squareMultipliedByTwo(a: Int): Int { +internal fun squareMultipliedByTwo(a: Int): Int { return inline3(a) } diff --git a/js/js.translator/testData/inline/cases/inlineDefaultArgument.kt b/js/js.translator/testData/inline/cases/inlineDefaultArgument.kt index efa18e307dc..fdc596d6b3f 100644 --- a/js/js.translator/testData/inline/cases/inlineDefaultArgument.kt +++ b/js/js.translator/testData/inline/cases/inlineDefaultArgument.kt @@ -3,15 +3,15 @@ package foo // CHECK_CONTAINS_NO_CALLS: identity // CHECK_CONTAINS_NO_CALLS: sumNoInline -inline fun sum(a: Int, b: Int = 0): Int { +internal inline fun sum(a: Int, b: Int = 0): Int { return a + b } -fun identity(a: Int): Int { +internal fun identity(a: Int): Int { return sum(a) } -fun sumNoInline(a: Int, b: Int): Int { +internal fun sumNoInline(a: Int, b: Int): Int { return sum(a, b) } diff --git a/js/js.translator/testData/inline/cases/inlineFunctionInLambda.kt b/js/js.translator/testData/inline/cases/inlineFunctionInLambda.kt index 2545ca5d490..00810f91643 100644 --- a/js/js.translator/testData/inline/cases/inlineFunctionInLambda.kt +++ b/js/js.translator/testData/inline/cases/inlineFunctionInLambda.kt @@ -2,15 +2,15 @@ package foo // CHECK_CONTAINS_NO_CALLS: doNothingNoInline -inline fun doNothing1(a: T): T { +internal inline fun doNothing1(a: T): T { return a } -inline fun doNothing2(a: T, f: (T) -> T): T { +internal inline fun doNothing2(a: T, f: (T) -> T): T { return f(a) } -fun doNothingNoInline(a: Int): Int { +internal fun doNothingNoInline(a: Int): Int { return doNothing2(a, { x -> doNothing1(x)}) } diff --git a/js/js.translator/testData/inline/cases/inlineGenericSimple.kt b/js/js.translator/testData/inline/cases/inlineGenericSimple.kt index 46c1e62c378..8defd78ac2b 100644 --- a/js/js.translator/testData/inline/cases/inlineGenericSimple.kt +++ b/js/js.translator/testData/inline/cases/inlineGenericSimple.kt @@ -3,15 +3,15 @@ package foo // CHECK_CONTAINS_NO_CALLS: doNothingInt // CHECK_CONTAINS_NO_CALLS: doNothingStr -inline fun doNothing(a: T): T { +internal inline fun doNothing(a: T): T { return a } -fun doNothingInt(a: Int): Int { +internal fun doNothingInt(a: Int): Int { return doNothing(a) } -fun doNothingStr(a: String): String { +internal fun doNothingStr(a: String): String { return doNothing(a) } diff --git a/js/js.translator/testData/inline/cases/inlineInc.kt b/js/js.translator/testData/inline/cases/inlineInc.kt index 12c37ba1bf3..f90c737cddf 100644 --- a/js/js.translator/testData/inline/cases/inlineInc.kt +++ b/js/js.translator/testData/inline/cases/inlineInc.kt @@ -2,11 +2,11 @@ package foo // CHECK_CONTAINS_NO_CALLS: multiplyNoInline -inline fun multiply(a: Int, b: Int): Int { +internal inline fun multiply(a: Int, b: Int): Int { return a * b } -fun multiplyNoInline(a: Int, b: Int): Int { +internal fun multiplyNoInline(a: Int, b: Int): Int { var c = a - 1 var d = b - 1 return (c++) + (d++) + multiply(c, d) - (--c + --d) diff --git a/js/js.translator/testData/inline/cases/inlineIntSimple.kt b/js/js.translator/testData/inline/cases/inlineIntSimple.kt index 0e8471e40af..55411501952 100644 --- a/js/js.translator/testData/inline/cases/inlineIntSimple.kt +++ b/js/js.translator/testData/inline/cases/inlineIntSimple.kt @@ -4,7 +4,7 @@ package foo // CHECK_CONTAINS_NO_CALLS: doNothing2 // CHECK_CONTAINS_NO_CALLS: doNothing3 -class Inline { +internal class Inline { public inline fun identity1 (x: T): T { return x } @@ -18,15 +18,15 @@ class Inline { } } -fun doNothing1 (inline1: Inline, a: Int): Int { +internal fun doNothing1 (inline1: Inline, a: Int): Int { return inline1.identity1(a) } -fun doNothing2 (inline2: Inline, a: Int): Int { +internal fun doNothing2 (inline2: Inline, a: Int): Int { return inline2.identity2(a, {it}) } -fun doNothing3 (inline3: Inline): Int { +internal fun doNothing3 (inline3: Inline): Int { return inline3.identity3({11}) } diff --git a/js/js.translator/testData/inline/cases/inlineLambdaNoCapture.kt b/js/js.translator/testData/inline/cases/inlineLambdaNoCapture.kt index 00ee3265b93..0b039d77351 100644 --- a/js/js.translator/testData/inline/cases/inlineLambdaNoCapture.kt +++ b/js/js.translator/testData/inline/cases/inlineLambdaNoCapture.kt @@ -2,7 +2,7 @@ package foo // CHECK_CONTAINS_NO_CALLS: sumEven -inline fun filteredReduce(a: Array, predicate: (Int) -> Boolean, reduceFun: (Int, Int) -> Int): Int { +internal inline fun filteredReduce(a: Array, predicate: (Int) -> Boolean, reduceFun: (Int, Int) -> Int): Int { var result = 0 for (element in a) { @@ -15,7 +15,7 @@ inline fun filteredReduce(a: Array, predicate: (Int) -> Boolean, reduceFun: return result } -fun sumEven(a: Array): Int { +internal fun sumEven(a: Array): Int { return filteredReduce(a, { x -> x % 2 == 0}, { x, y -> x + y}) } diff --git a/js/js.translator/testData/inline/cases/inlineLambdaWithCapture.kt b/js/js.translator/testData/inline/cases/inlineLambdaWithCapture.kt index 88213ecbc51..6e585d87d39 100644 --- a/js/js.translator/testData/inline/cases/inlineLambdaWithCapture.kt +++ b/js/js.translator/testData/inline/cases/inlineLambdaWithCapture.kt @@ -2,9 +2,9 @@ package foo // CHECK_CONTAINS_NO_CALLS: maxBySquare -data class Result(var value: Int = 0, var invocationCount: Int = 0) +internal data class Result(var value: Int = 0, var invocationCount: Int = 0) -inline fun maxBy(a: Array, keyFun: (Int) -> Int): Int { +internal inline fun maxBy(a: Array, keyFun: (Int) -> Int): Int { var maxVal = a[0] var maxKey = keyFun(maxVal) @@ -20,7 +20,7 @@ inline fun maxBy(a: Array, keyFun: (Int) -> Int): Int { return maxVal } -fun maxBySquare(a: Array, r: Result): Result { +internal fun maxBySquare(a: Array, r: Result): Result { var invocationCount = 0 val maxVal = maxBy(a, { x -> invocationCount++; x * x;}) diff --git a/js/js.translator/testData/inline/cases/inlineMethod.kt b/js/js.translator/testData/inline/cases/inlineMethod.kt index b25c76327e4..b1bebc5dfb0 100644 --- a/js/js.translator/testData/inline/cases/inlineMethod.kt +++ b/js/js.translator/testData/inline/cases/inlineMethod.kt @@ -2,7 +2,7 @@ package foo // CHECK_CONTAINS_NO_CALLS: add -data class IntPair(public var fst: Int, public var snd: Int) { +internal data class IntPair(public var fst: Int, public var snd: Int) { inline public fun getFst(): Int { return fst } inline public fun setFst(v: Int) { fst = v } @@ -10,7 +10,7 @@ data class IntPair(public var fst: Int, public var snd: Int) { inline public fun setSnd(v: Int) { this.snd = v } } -fun add(p: IntPair, toFst: Int, toSnd: Int) { +internal fun add(p: IntPair, toFst: Int, toSnd: Int) { val fst = p.getFst() p.setFst(fst + toFst) diff --git a/js/js.translator/testData/inline/cases/inlineNoReturn.kt b/js/js.translator/testData/inline/cases/inlineNoReturn.kt index 293c5e062fb..5fb1db05a38 100644 --- a/js/js.translator/testData/inline/cases/inlineNoReturn.kt +++ b/js/js.translator/testData/inline/cases/inlineNoReturn.kt @@ -2,22 +2,22 @@ package foo // CHECK_CONTAINS_NO_CALLS: factAbsNoInline1 -class State(value: Int) { +internal class State(value: Int) { public var value: Int = value } -inline fun multiply(state: State, factor: Int) { +internal inline fun multiply(state: State, factor: Int) { state.value *= factor } -inline fun abs(state: State) { +internal inline fun abs(state: State) { val value = state.value if (value < 0) { multiply(state, -1) } } -inline fun factAbs(state: State) { +internal inline fun factAbs(state: State) { abs(state) if (state.value == 0) { @@ -32,12 +32,12 @@ inline fun factAbs(state: State) { } } -fun factAbsNoInline1(state: State): Int { +internal fun factAbsNoInline1(state: State): Int { factAbs(state) return state.value } -fun factAbsNoInline2(n: Int): Int { +internal fun factAbsNoInline2(n: Int): Int { return factAbsNoInline1(State(n)) } diff --git a/js/js.translator/testData/inline/cases/jsCode.kt b/js/js.translator/testData/inline/cases/jsCode.kt index 8a93ce00af0..5c2013cee92 100644 --- a/js/js.translator/testData/inline/cases/jsCode.kt +++ b/js/js.translator/testData/inline/cases/jsCode.kt @@ -2,9 +2,9 @@ package foo // CHECK_CONTAINS_NO_CALLS: test -inline fun sum(x: Int, y: Int): Int = js("x + y") +internal inline fun sum(x: Int, y: Int): Int = js("x + y") -fun test(x: Int, y: Int): Int = sum(sum(x, x), sum(y, y)) +internal fun test(x: Int, y: Int): Int = sum(sum(x, x), sum(y, y)) fun box(): String { assertEquals(4, test(1, 1)) diff --git a/js/js.translator/testData/inline/cases/jsCodeVarDeclared.kt b/js/js.translator/testData/inline/cases/jsCodeVarDeclared.kt index 3f4eb384801..474e0277071 100644 --- a/js/js.translator/testData/inline/cases/jsCodeVarDeclared.kt +++ b/js/js.translator/testData/inline/cases/jsCodeVarDeclared.kt @@ -2,9 +2,9 @@ package foo // CHECK_CONTAINS_NO_CALLS: test -inline fun sum(x: Int, y: Int): Int = js("var a = x; a + y") +internal inline fun sum(x: Int, y: Int): Int = js("var a = x; a + y") -fun test(x: Int, y: Int): Int { +internal fun test(x: Int, y: Int): Int { val xx = sum(x, x) js("var a = 0;") val yy = sum(y, y) diff --git a/js/js.translator/testData/inline/cases/lambdaInLambda.kt b/js/js.translator/testData/inline/cases/lambdaInLambda.kt index 45f4b5acc39..3437145f473 100644 --- a/js/js.translator/testData/inline/cases/lambdaInLambda.kt +++ b/js/js.translator/testData/inline/cases/lambdaInLambda.kt @@ -4,11 +4,11 @@ package foo // CHECK_NOT_CALLED_IN_SCOPE: scope=multiplyBy2 function=multiplyBy2$f_0 // CHECK_NOT_CALLED_IN_SCOPE: scope=multiplyBy2 function=run -inline fun runLambdaInLambda(noinline inner: (T) -> T, outer: ((T) -> T, T) -> T, arg: T): T { +internal inline fun runLambdaInLambda(noinline inner: (T) -> T, outer: ((T) -> T, T) -> T, arg: T): T { return outer(inner, arg) } -fun multiplyBy2(x: Int): Int { +internal fun multiplyBy2(x: Int): Int { return runLambdaInLambda({ it * 2 }, { f, x -> f(x) }, x) } diff --git a/js/js.translator/testData/inline/cases/localInlineExtensionFunction.kt b/js/js.translator/testData/inline/cases/localInlineExtensionFunction.kt index e47912478c7..83992789024 100644 --- a/js/js.translator/testData/inline/cases/localInlineExtensionFunction.kt +++ b/js/js.translator/testData/inline/cases/localInlineExtensionFunction.kt @@ -3,15 +3,15 @@ package foo // CHECK_CONTAINS_NO_CALLS: capturedInLambda // CHECK_CONTAINS_NO_CALLS: declaredInLambda -data class State(var count: Int = 0) +internal data class State(var count: Int = 0) -inline fun repeatAction(times: Int, action: () -> Unit) { +internal inline fun repeatAction(times: Int, action: () -> Unit) { for (i in 1..times) { action() } } -fun capturedInLambda(state: State, a: Int, b: Int): Int { +internal fun capturedInLambda(state: State, a: Int, b: Int): Int { @inline fun State.inc() { count++ } @@ -24,7 +24,7 @@ fun capturedInLambda(state: State, a: Int, b: Int): Int { } -fun declaredInLambda(state: State, a: Int, b: Int): Int { +internal fun declaredInLambda(state: State, a: Int, b: Int): Int { repeatAction(a) { @inline fun State.inc() { count++ diff --git a/js/js.translator/testData/inline/cases/localInlineFunction.kt b/js/js.translator/testData/inline/cases/localInlineFunction.kt index 01bc34cb1e0..14acb661708 100644 --- a/js/js.translator/testData/inline/cases/localInlineFunction.kt +++ b/js/js.translator/testData/inline/cases/localInlineFunction.kt @@ -3,13 +3,13 @@ package foo // CHECK_CONTAINS_NO_CALLS: localWithCapture // CHECK_CONTAINS_NO_CALLS: localWithoutCapture -inline fun repeatAction(times: Int, action: () -> Unit) { +internal inline fun repeatAction(times: Int, action: () -> Unit) { for (i in 1..times) { action() } } -fun localWithoutCapture(a: Int, b: Int): Int { +internal fun localWithoutCapture(a: Int, b: Int): Int { var sum = 0 @inline fun inc(x: Int): Int { @@ -23,7 +23,7 @@ fun localWithoutCapture(a: Int, b: Int): Int { return sum } -fun localWithCapture(a: Int, b: Int): Int { +internal fun localWithCapture(a: Int, b: Int): Int { var sum = 0 @inline fun inc() { diff --git a/js/js.translator/testData/inline/cases/localInlineFunctionComplex.kt b/js/js.translator/testData/inline/cases/localInlineFunctionComplex.kt index 920870e083c..5fdc6abe233 100644 --- a/js/js.translator/testData/inline/cases/localInlineFunctionComplex.kt +++ b/js/js.translator/testData/inline/cases/localInlineFunctionComplex.kt @@ -2,15 +2,15 @@ package foo // CHECK_CONTAINS_NO_CALLS: add -data class State(var count: Int = 0) +internal data class State(var count: Int = 0) -inline fun repeatAction(times: Int, action: () -> Unit) { +internal inline fun repeatAction(times: Int, action: () -> Unit) { for (i in 1..times) { action() } } -fun add(state: State, a: Int, b: Int): Int { +internal fun add(state: State, a: Int, b: Int): Int { @inline fun inc(a: Int): Int { return a + 1 } diff --git a/js/js.translator/testData/inline/cases/localInlineFunctionDeclaredInLambda.kt b/js/js.translator/testData/inline/cases/localInlineFunctionDeclaredInLambda.kt index a6fad44ca50..26f0b93936c 100644 --- a/js/js.translator/testData/inline/cases/localInlineFunctionDeclaredInLambda.kt +++ b/js/js.translator/testData/inline/cases/localInlineFunctionDeclaredInLambda.kt @@ -3,13 +3,13 @@ package foo // CHECK_CONTAINS_NO_CALLS: localWithCapture // CHECK_CONTAINS_NO_CALLS: localWithoutCapture -inline fun repeatAction(times: Int, action: () -> Unit) { +internal inline fun repeatAction(times: Int, action: () -> Unit) { for (i in 1..times) { action() } } -fun localWithoutCapture(a: Int, b: Int): Int { +internal fun localWithoutCapture(a: Int, b: Int): Int { var mult = 0 repeatAction(a) { @@ -25,7 +25,7 @@ fun localWithoutCapture(a: Int, b: Int): Int { return mult } -fun localWithCapture(a: Int, b: Int): Int { +internal fun localWithCapture(a: Int, b: Int): Int { var mult = 0 repeatAction(a) { diff --git a/js/js.translator/testData/inline/cases/localInlineFunctionNameClash.kt b/js/js.translator/testData/inline/cases/localInlineFunctionNameClash.kt index 1fccfdee227..5217f706a71 100644 --- a/js/js.translator/testData/inline/cases/localInlineFunctionNameClash.kt +++ b/js/js.translator/testData/inline/cases/localInlineFunctionNameClash.kt @@ -2,11 +2,11 @@ package foo // CHECK_CONTAINS_NO_CALLS: add -inline fun run(action: () -> Int): Int { +internal inline fun run(action: () -> Int): Int { return action() } -fun add(a: Int, b: Int): Int { +internal fun add(a: Int, b: Int): Int { var sum = a + b @inline fun getSum(): Int { diff --git a/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt b/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt index ba98b2e8f94..8631936db76 100644 --- a/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt +++ b/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt @@ -36,17 +36,17 @@ private object O { } } -fun test1(x: Int, y: Int): Int = apply(x) { it * y } +internal fun test1(x: Int, y: Int): Int = apply(x) { it * y } -fun test2(m: M, x: Int, y: Int): Int = m.applyM(x) { it * y } +internal fun test2(m: M, x: Int, y: Int): Int = m.applyM(x) { it * y } -fun test3(n: N, x: Int, y: Int): Int = n.applyN(x) { it * y } +internal fun test3(n: N, x: Int, y: Int): Int = n.applyN(x) { it * y } -object LTest : L() { +internal object LTest : L() { fun test4(l: L, x: Int, y: Int): Int = l.applyL(x) { it * y } } -fun test5(x: Int, y: Int): Int = O.OInner.applyO(x) { it * y } +internal fun test5(x: Int, y: Int): Int = O.OInner.applyO(x) { it * y } fun box(): String { assertEquals(6, test1(2, 3)) diff --git a/js/js.translator/testData/inline/cases/noInlineLambda.kt b/js/js.translator/testData/inline/cases/noInlineLambda.kt index a7d7d538ba2..64d0aee3150 100644 --- a/js/js.translator/testData/inline/cases/noInlineLambda.kt +++ b/js/js.translator/testData/inline/cases/noInlineLambda.kt @@ -3,11 +3,11 @@ package foo // CHECK_CALLED_IN_SCOPE: scope=multiplyBy2 function=multiplyBy2$f // CHECK_NOT_CALLED_IN_SCOPE: scope=multiplyBy2 function=run -inline fun run(noinline func: (T) -> T, arg: T): T { +internal inline fun run(noinline func: (T) -> T, arg: T): T { return func(arg) } -fun multiplyBy2(x: Int): Int { +internal fun multiplyBy2(x: Int): Int { return run({ it * 2 }, x) } diff --git a/js/js.translator/testData/inline/cases/vararg.kt b/js/js.translator/testData/inline/cases/vararg.kt index 37c06b89509..b5d4b081fcf 100644 --- a/js/js.translator/testData/inline/cases/vararg.kt +++ b/js/js.translator/testData/inline/cases/vararg.kt @@ -5,7 +5,7 @@ package foo // CHECK_CONTAINS_NO_CALLS: test2 // CHECK_CONTAINS_NO_CALLS: test3 -inline fun concat(vararg strings: String): String { +internal inline fun concat(vararg strings: String): String { var result = "" for (string in strings) { @@ -15,15 +15,15 @@ inline fun concat(vararg strings: String): String { return result } -fun test1(): String { +internal fun test1(): String { return concat() } -fun test2(): String { +internal fun test2(): String { return concat("a", "b", "c") } -fun test3(list: Array): String { +internal fun test3(list: Array): String { return concat(*list) } diff --git a/js/js.translator/testData/inlineMultiFile/cases/trait/trait.1.kt b/js/js.translator/testData/inlineMultiFile/cases/trait/trait.1.kt index a5328c83b8a..58f869213e3 100644 --- a/js/js.translator/testData/inlineMultiFile/cases/trait/trait.1.kt +++ b/js/js.translator/testData/inlineMultiFile/cases/trait/trait.1.kt @@ -11,15 +11,15 @@ import test.* // CHECK_CONTAINS_NO_CALLS: testFinalInline2 // CHECK_CONTAINS_NO_CALLS: testClassObject -fun testFinalInline(): String { +internal fun testFinalInline(): String { return Z().finalInline({"final"}) } -fun testFinalInline2(instance: InlineTrait): String { +internal fun testFinalInline2(instance: InlineTrait): String { return instance.finalInline({"final2"}) } -fun testClassObject(): String { +internal fun testClassObject(): String { return InlineTrait.finalInline({"classobject"}) } diff --git a/js/js.translator/testData/inlineMultiFile/cases/trait/trait.2.kt b/js/js.translator/testData/inlineMultiFile/cases/trait/trait.2.kt index de108ce1839..ded57608acd 100644 --- a/js/js.translator/testData/inlineMultiFile/cases/trait/trait.2.kt +++ b/js/js.translator/testData/inlineMultiFile/cases/trait/trait.2.kt @@ -5,14 +5,14 @@ package test -trait InlineTrait { +internal trait InlineTrait { - inline final fun finalInline(s: () -> String): String { + internal inline final fun finalInline(s: () -> String): String { return s() } companion object { - inline final fun finalInline(s: () -> String): String { + internal inline final fun finalInline(s: () -> String): String { return s() } } diff --git a/js/js.translator/testData/inlineMultiModule/cases/anotherModuleValInClosure/main/main.kt b/js/js.translator/testData/inlineMultiModule/cases/anotherModuleValInClosure/main/main.kt index 59da69ddf82..9b01de84303 100644 --- a/js/js.translator/testData/inlineMultiModule/cases/anotherModuleValInClosure/main/main.kt +++ b/js/js.translator/testData/inlineMultiModule/cases/anotherModuleValInClosure/main/main.kt @@ -2,7 +2,7 @@ import utils.* // CHECK_CONTAINS_NO_CALLS: test -fun test(s: String): String = log(s + ";") +internal fun test(s: String): String = log(s + ";") fun box(): String { assertEquals("a;", test("a")) diff --git a/js/js.translator/testData/inlineMultiModule/cases/callableReference/main/main.kt b/js/js.translator/testData/inlineMultiModule/cases/callableReference/main/main.kt index bac7d6bf36e..c186715bc81 100644 --- a/js/js.translator/testData/inlineMultiModule/cases/callableReference/main/main.kt +++ b/js/js.translator/testData/inlineMultiModule/cases/callableReference/main/main.kt @@ -2,9 +2,9 @@ import utils.* // CHECK_CONTAINS_NO_CALLS: test -fun multiplyBy2(x: Int): Int = x * 2 +internal fun multiplyBy2(x: Int): Int = x * 2 -fun test(x: Int): Int = apply(x, ::multiplyBy2) +internal fun test(x: Int): Int = apply(x, ::multiplyBy2) fun box(): String { assertEquals(6, test(3)) diff --git a/js/js.translator/testData/inlineMultiModule/cases/calledByFqName/main/main.kt b/js/js.translator/testData/inlineMultiModule/cases/calledByFqName/main/main.kt index 186f148677c..116516fba60 100644 --- a/js/js.translator/testData/inlineMultiModule/cases/calledByFqName/main/main.kt +++ b/js/js.translator/testData/inlineMultiModule/cases/calledByFqName/main/main.kt @@ -1,6 +1,6 @@ // CHECK_CONTAINS_NO_CALLS: test -fun test(x: Int, y: Int): Int = utils.sum(x, y) +internal fun test(x: Int, y: Int): Int = utils.sum(x, y) fun box(): String { assertEquals(3, test(1, 2)) diff --git a/js/js.translator/testData/inlineMultiModule/cases/extensionLambda/main/main.kt b/js/js.translator/testData/inlineMultiModule/cases/extensionLambda/main/main.kt index 70b75e1fbe0..d6773e7021f 100644 --- a/js/js.translator/testData/inlineMultiModule/cases/extensionLambda/main/main.kt +++ b/js/js.translator/testData/inlineMultiModule/cases/extensionLambda/main/main.kt @@ -2,9 +2,9 @@ import utils.* // CHECK_CONTAINS_NO_CALLS: test -class A(val n: Int) +internal class A(val n: Int) -fun test(a: A, m: Int): Int = apply(a) { n * m } +internal fun test(a: A, m: Int): Int = apply(a) { n * m } fun box(): String { assertEquals(6, test(A(2), 3)) diff --git a/js/js.translator/testData/inlineMultiModule/cases/lambda/main/main.kt b/js/js.translator/testData/inlineMultiModule/cases/lambda/main/main.kt index 4a2e1cb2aa9..c1f5c20e917 100644 --- a/js/js.translator/testData/inlineMultiModule/cases/lambda/main/main.kt +++ b/js/js.translator/testData/inlineMultiModule/cases/lambda/main/main.kt @@ -2,7 +2,7 @@ import utils.* // CHECK_CONTAINS_NO_CALLS: test -fun test(x: Int): Int = apply(x) { it * 2 } +internal fun test(x: Int): Int = apply(x) { it * 2 } fun box(): String { assertEquals(6, test(3)) diff --git a/js/js.translator/testData/inlineMultiModule/cases/lambdaCalledInObjectLiteral/main/main.kt b/js/js.translator/testData/inlineMultiModule/cases/lambdaCalledInObjectLiteral/main/main.kt index ac707b0d9a5..55d655ba5d9 100644 --- a/js/js.translator/testData/inlineMultiModule/cases/lambdaCalledInObjectLiteral/main/main.kt +++ b/js/js.translator/testData/inlineMultiModule/cases/lambdaCalledInObjectLiteral/main/main.kt @@ -1,6 +1,6 @@ import utils.* -fun test(x: Int): Int = apply(x) { it * 2 } +internal fun test(x: Int): Int = apply(x) { it * 2 } fun box(): String { assertEquals(6, test(3)) diff --git a/js/js.translator/testData/inlineMultiModule/cases/lambdaWithClosure/main/main.kt b/js/js.translator/testData/inlineMultiModule/cases/lambdaWithClosure/main/main.kt index 1a364b14783..0d0ce1980f8 100644 --- a/js/js.translator/testData/inlineMultiModule/cases/lambdaWithClosure/main/main.kt +++ b/js/js.translator/testData/inlineMultiModule/cases/lambdaWithClosure/main/main.kt @@ -2,7 +2,7 @@ import utils.* // CHECK_CONTAINS_NO_CALLS: test -fun test(x: Int, y: Int): Int = apply(x) { it + y } +internal fun test(x: Int, y: Int): Int = apply(x) { it + y } fun box(): String { assertEquals(3, test(1, 2)) diff --git a/js/js.translator/testData/inlineMultiModule/cases/localNameClash/main/main.kt b/js/js.translator/testData/inlineMultiModule/cases/localNameClash/main/main.kt index b850d240d33..f2e201d184d 100644 --- a/js/js.translator/testData/inlineMultiModule/cases/localNameClash/main/main.kt +++ b/js/js.translator/testData/inlineMultiModule/cases/localNameClash/main/main.kt @@ -2,7 +2,7 @@ import utils.* // CHECK_CONTAINS_NO_CALLS: test -fun test(x: Int, y: Int): Int = apply(x) { it + 1 } * y +internal fun test(x: Int, y: Int): Int = apply(x) { it + 1 } * y fun box(): String { assertEquals(6, test(1, 3)) diff --git a/js/js.translator/testData/inlineMultiModule/cases/method/main/main.kt b/js/js.translator/testData/inlineMultiModule/cases/method/main/main.kt index 8e55aa6c768..5ab7c86859b 100644 --- a/js/js.translator/testData/inlineMultiModule/cases/method/main/main.kt +++ b/js/js.translator/testData/inlineMultiModule/cases/method/main/main.kt @@ -2,7 +2,7 @@ import utils.* // CHECK_CONTAINS_NO_CALLS: test -fun test(a: A, y: Int): Int = a.plus(y) +internal fun test(a: A, y: Int): Int = a.plus(y) fun box(): String { assertEquals(5, test(A(2), 3)) diff --git a/js/js.translator/testData/inlineMultiModule/cases/simple/main/main.kt b/js/js.translator/testData/inlineMultiModule/cases/simple/main/main.kt index bd63c8d38b0..364a60e7d47 100644 --- a/js/js.translator/testData/inlineMultiModule/cases/simple/main/main.kt +++ b/js/js.translator/testData/inlineMultiModule/cases/simple/main/main.kt @@ -2,7 +2,7 @@ import utils.* // CHECK_CONTAINS_NO_CALLS: test -fun test(x: Int, y: Int): Int = sum(x, y) +internal fun test(x: Int, y: Int): Int = sum(x, y) fun box(): String { assertEquals(3, test(1, 2)) diff --git a/js/js.translator/testData/inlineSizeReduction/cases/lastBreak.kt b/js/js.translator/testData/inlineSizeReduction/cases/lastBreak.kt index 6ed748b76bd..c9ee16efce9 100644 --- a/js/js.translator/testData/inlineSizeReduction/cases/lastBreak.kt +++ b/js/js.translator/testData/inlineSizeReduction/cases/lastBreak.kt @@ -4,10 +4,10 @@ package foo // CHECK_NOT_CALLED: f2 // CHECK_BREAKS_COUNT: function=test count=3 -var even = arrayListOf() -var odd = arrayListOf() +internal var even = arrayListOf() +internal var odd = arrayListOf() -inline fun f2(x: Int): Unit { +internal inline fun f2(x: Int): Unit { if (x % 2 == 0) { even.add(x) return @@ -17,7 +17,7 @@ inline fun f2(x: Int): Unit { return } -inline fun f1(x: Boolean, y: Int, z: Int): Unit { +internal inline fun f1(x: Boolean, y: Int, z: Int): Unit { if (x) { return f2(y) } @@ -25,7 +25,7 @@ inline fun f1(x: Boolean, y: Int, z: Int): Unit { return f2(z) } -fun test(x: Boolean, y: Int, z: Int): Unit = f1(x, y, z) +internal fun test(x: Boolean, y: Int, z: Int): Unit = f1(x, y, z) fun box(): String { test(true, 2, 1) diff --git a/js/js.translator/testData/inlineSizeReduction/cases/oneTopLevelReturn.kt b/js/js.translator/testData/inlineSizeReduction/cases/oneTopLevelReturn.kt index 3ed12b5c4f9..8ba8182f4ef 100644 --- a/js/js.translator/testData/inlineSizeReduction/cases/oneTopLevelReturn.kt +++ b/js/js.translator/testData/inlineSizeReduction/cases/oneTopLevelReturn.kt @@ -7,24 +7,24 @@ package foo var log = "" -inline fun run1(fn: ()->Int): Int { +internal inline fun run1(fn: ()->Int): Int { log += "1;" return 1 + fn() } -inline fun run2(fn: ()->Int): Int { +internal inline fun run2(fn: ()->Int): Int { log += "2;" return 2 + run1(fn) } -inline fun run3(fn: ()->Int): Int { +internal inline fun run3(fn: ()->Int): Int { log += "3;" return 3 + run2(fn) } -fun test1(x: Int): Int = run3 { x } +internal fun test1(x: Int): Int = run3 { x } -fun test2(x: Int): Int { +internal fun test2(x: Int): Int { val result = 1 + run3 { x } return result } diff --git a/js/js.translator/testData/inlineSizeReduction/cases/returnInlineCall.kt b/js/js.translator/testData/inlineSizeReduction/cases/returnInlineCall.kt index 94cfb2dcc30..11bef5562d8 100644 --- a/js/js.translator/testData/inlineSizeReduction/cases/returnInlineCall.kt +++ b/js/js.translator/testData/inlineSizeReduction/cases/returnInlineCall.kt @@ -3,7 +3,7 @@ package foo // CHECK_CONTAINS_NO_CALLS: test // CHECK_VARS_COUNT: function=test count=0 -inline fun sign(x: Int): Int { +internal inline fun sign(x: Int): Int { if (x < 0) return -1 if (x == 0) return 0 @@ -11,7 +11,7 @@ inline fun sign(x: Int): Int { return 1 } -fun test(x: Int, y: Int): Int { +internal fun test(x: Int, y: Int): Int { if (x != 0) { return sign(x) } diff --git a/js/js.translator/testData/inlineSizeReduction/cases/simpleReturnFunction.kt b/js/js.translator/testData/inlineSizeReduction/cases/simpleReturnFunction.kt index 6addcd524bd..9531e616919 100644 --- a/js/js.translator/testData/inlineSizeReduction/cases/simpleReturnFunction.kt +++ b/js/js.translator/testData/inlineSizeReduction/cases/simpleReturnFunction.kt @@ -6,9 +6,9 @@ package foo // A copy of stdlib run function. // Copied to not to depend on run implementation. // It's important, that the body is just `return fn()`. -inline fun evaluate(fn: ()->T): T = fn() +internal inline fun evaluate(fn: ()->T): T = fn() -fun test(x: Int): Int = +internal fun test(x: Int): Int = evaluate { evaluate { 2 } * evaluate { x } } diff --git a/js/js.translator/testData/inlineSizeReduction/cases/this.kt b/js/js.translator/testData/inlineSizeReduction/cases/this.kt index c13c52914f0..4c222fffbe1 100644 --- a/js/js.translator/testData/inlineSizeReduction/cases/this.kt +++ b/js/js.translator/testData/inlineSizeReduction/cases/this.kt @@ -3,13 +3,13 @@ package foo // CHECK_CONTAINS_NO_CALLS: test // CHECK_VARS_COUNT: function=test count=0 -class A(val x: Int) { +internal class A(val x: Int) { inline fun f(): Int = x inline fun ff(): Int = f() } -fun test(a: A): Int = a.ff() +internal fun test(a: A): Int = a.ff() fun box(): String { assertEquals(1, test(A(1))) diff --git a/js/js.translator/testData/inlineSizeReduction/cases/valAssignment.kt b/js/js.translator/testData/inlineSizeReduction/cases/valAssignment.kt index a98af3bceaa..fa465f6a2ac 100644 --- a/js/js.translator/testData/inlineSizeReduction/cases/valAssignment.kt +++ b/js/js.translator/testData/inlineSizeReduction/cases/valAssignment.kt @@ -3,13 +3,13 @@ package foo // CHECK_CONTAINS_NO_CALLS: test // CHECK_VARS_COUNT: function=test count=1 -inline fun sum(x: Int, y: Int): Int { +internal inline fun sum(x: Int, y: Int): Int { if (x == 0 || y == 0) return 0 return x + y } -fun test(x: Int, y: Int): Int { +internal fun test(x: Int, y: Int): Int { val sum: Int sum = sum(x, y) return sum diff --git a/js/js.translator/testData/inlineSizeReduction/cases/valDeclaration.kt b/js/js.translator/testData/inlineSizeReduction/cases/valDeclaration.kt index f50198fc39c..dc781650c52 100644 --- a/js/js.translator/testData/inlineSizeReduction/cases/valDeclaration.kt +++ b/js/js.translator/testData/inlineSizeReduction/cases/valDeclaration.kt @@ -3,13 +3,13 @@ package foo // CHECK_CONTAINS_NO_CALLS: test // CHECK_VARS_COUNT: function=test count=1 -inline fun sum(x: Int, y: Int): Int { +internal inline fun sum(x: Int, y: Int): Int { if (x == 0 || y == 0) return 0 return x + y } -fun test(x: Int, y: Int): Int { +internal fun test(x: Int, y: Int): Int { val sum = sum(x, y) return sum } diff --git a/js/js.translator/testData/inlineStdlib/cases/callableRefToFunInCurrentModule.kt b/js/js.translator/testData/inlineStdlib/cases/callableRefToFunInCurrentModule.kt index c032ea49a52..818e656b180 100644 --- a/js/js.translator/testData/inlineStdlib/cases/callableRefToFunInCurrentModule.kt +++ b/js/js.translator/testData/inlineStdlib/cases/callableRefToFunInCurrentModule.kt @@ -3,9 +3,9 @@ package foo // CHECK_NOT_CALLED_IN_SCOPE: scope=test function=even // CHECK_NOT_CALLED_IN_SCOPE: scope=test function=filter_azvtw4$ -fun even(x: Int) = x % 2 == 0 +internal fun even(x: Int) = x % 2 == 0 -fun test(a: List) = a.filter(::even) +internal fun test(a: List) = a.filter(::even) fun box(): String { assertEquals(listOf(2, 4), test(listOf(1, 2, 3, 4))) diff --git a/js/js.translator/testData/inlineStdlib/cases/closure.kt b/js/js.translator/testData/inlineStdlib/cases/closure.kt index a917f1eb1c2..fcd53f5ded3 100644 --- a/js/js.translator/testData/inlineStdlib/cases/closure.kt +++ b/js/js.translator/testData/inlineStdlib/cases/closure.kt @@ -2,7 +2,7 @@ package foo // CHECK_CONTAINS_NO_CALLS: test -fun test(a: Int, b: Int): Int { +internal fun test(a: Int, b: Int): Int { var c = 0 b.times { diff --git a/js/js.translator/testData/inlineStdlib/cases/closureNested.kt b/js/js.translator/testData/inlineStdlib/cases/closureNested.kt index e3501f7d60b..b19b766aaea 100644 --- a/js/js.translator/testData/inlineStdlib/cases/closureNested.kt +++ b/js/js.translator/testData/inlineStdlib/cases/closureNested.kt @@ -2,7 +2,7 @@ package foo // CHECK_CONTAINS_NO_CALLS: test -fun test(a: Int, b: Int): Int { +internal fun test(a: Int, b: Int): Int { var res = 0 with (a + b) { diff --git a/js/js.translator/testData/inlineStdlib/cases/localNamesClash.kt b/js/js.translator/testData/inlineStdlib/cases/localNamesClash.kt index ebb0dbe5010..81152cb0e8a 100644 --- a/js/js.translator/testData/inlineStdlib/cases/localNamesClash.kt +++ b/js/js.translator/testData/inlineStdlib/cases/localNamesClash.kt @@ -2,7 +2,7 @@ package foo // CHECK_CONTAINS_NO_CALLS: test -fun test(x: Int, y: Int): Int = +internal fun test(x: Int, y: Int): Int = with (x + x) { val xx = this diff --git a/js/js.translator/testData/inlineStdlib/cases/simple.kt b/js/js.translator/testData/inlineStdlib/cases/simple.kt index d73adebb927..467a1964945 100644 --- a/js/js.translator/testData/inlineStdlib/cases/simple.kt +++ b/js/js.translator/testData/inlineStdlib/cases/simple.kt @@ -2,9 +2,9 @@ package foo // CHECK_CONTAINS_NO_CALLS: test -var counter = 0 +internal var counter = 0 -fun test(a: Int) { +internal fun test(a: Int) { a.times { counter += 1 } diff --git a/js/js.translator/testData/inlineStdlib/cases/thisInExtension.kt b/js/js.translator/testData/inlineStdlib/cases/thisInExtension.kt index f26b1e48687..08737565749 100644 --- a/js/js.translator/testData/inlineStdlib/cases/thisInExtension.kt +++ b/js/js.translator/testData/inlineStdlib/cases/thisInExtension.kt @@ -3,15 +3,15 @@ package foo // CHECK_CONTAINS_NO_CALLS: testImplicitThis // CHECK_CONTAINS_NO_CALLS: testExplicitThis -class A(var value: Int) +internal class A(var value: Int) -fun testImplicitThis(a: A, newValue: Int) { +internal fun testImplicitThis(a: A, newValue: Int) { with (a) { value = newValue } } -fun testExplicitThis(a: A, newValue: Int) { +internal fun testExplicitThis(a: A, newValue: Int) { with (a) { this.value = newValue } diff --git a/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashing.kt b/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashing.kt index c13db0dc3c4..1e244a1d32e 100644 --- a/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashing.kt +++ b/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashing.kt @@ -9,28 +9,28 @@ class State() { public var value: Int = 0 } -inline fun test1(state: State) { +internal inline fun test1(state: State) { loop@ for (i in 1..10) { state.value++ if (i == 2) break@loop } } -inline fun test2(state: State) { +internal inline fun test2(state: State) { loop@ for (i in 1..10) { test1(state) if (i == 2) break@loop } } -inline fun test3(state: State) { +internal inline fun test3(state: State) { loop@ for (i in 1..10) { test2(state) if (i == 2) break@loop } } -fun test(state: State) { +internal fun test(state: State) { test3(state) } diff --git a/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt b/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt index e478350ba2c..aa7590ef535 100644 --- a/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt +++ b/js/js.translator/testData/labels/cases/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt @@ -8,7 +8,7 @@ class State() { public var value: Int = 0 } -fun test(state: State) { +internal fun test(state: State) { @inline fun test3() { @inline fun test2() { @inline fun test1() { diff --git a/js/js.translator/testData/native/cases/inheritanceFromNativeClass.kt b/js/js.translator/testData/native/cases/inheritanceFromNativeClass.kt index 0ba096cb01a..6813d18a00d 100644 --- a/js/js.translator/testData/native/cases/inheritanceFromNativeClass.kt +++ b/js/js.translator/testData/native/cases/inheritanceFromNativeClass.kt @@ -1,7 +1,7 @@ package foo native -open class A(val a: Int) { +internal open class A(val a: Int) { fun g(): Int = noImpl fun m(): Int = noImpl @@ -11,7 +11,7 @@ open class A(val a: Int) { open fun baz(i: Int): String = noImpl } -class B(val b: Int) : A(b / 2) { +internal class B(val b: Int) : A(b / 2) { override fun foo(i: Int): String = "B.foo($i: Int)" fun boo(): String = "B.boo()" diff --git a/js/js.translator/testData/native/cases/nativePropertyWithCustomName.kt b/js/js.translator/testData/native/cases/nativePropertyWithCustomName.kt index 00991c3660c..d711138dd66 100644 --- a/js/js.translator/testData/native/cases/nativePropertyWithCustomName.kt +++ b/js/js.translator/testData/native/cases/nativePropertyWithCustomName.kt @@ -1,18 +1,18 @@ package foo -val PACKAGE = "Kotlin.modules.JS_TESTS.foo" +internal val PACKAGE = "Kotlin.modules.JS_TESTS.foo" -fun funToString(name: String) = eval("$PACKAGE.$name.toString()") as String +internal fun funToString(name: String) = eval("$PACKAGE.$name.toString()") as String -native("\"O\"") val foo: String = noImpl -native("boo") val bar: String = noImpl +internal native("\"O\"") val foo: String = noImpl +internal native("boo") val bar: String = noImpl -class A -native("__proto__") val Any.proto: String get() = noImpl -native("__proto__") val A.proto: String get() = noImpl +internal class A +internal native("__proto__") val Any.proto: String get() = noImpl +internal native("__proto__") val A.proto: String get() = noImpl -fun actual(foo: String, native("boo") bar: String) = foo + bar -fun expected(foo: String, boo: String) = foo + boo +internal fun actual(foo: String, native("boo") bar: String) = foo + bar +internal fun expected(foo: String, boo: String) = foo + boo fun box(): String { val OK = "OK" diff --git a/js/js.translator/testData/native/cases/passExtLambdaFromNative.kt b/js/js.translator/testData/native/cases/passExtLambdaFromNative.kt index 51653a260fa..237413dcc5f 100644 --- a/js/js.translator/testData/native/cases/passExtLambdaFromNative.kt +++ b/js/js.translator/testData/native/cases/passExtLambdaFromNative.kt @@ -1,14 +1,14 @@ package foo native -class A(val v: String) +internal class A(val v: String) -class B { +internal class B { fun bar(a: A, extLambda: A.(Int, String) -> String): String = a.extLambda(7, "_rr_") } native -fun nativeBox(b: B): String = noImpl +internal fun nativeBox(b: B): String = noImpl fun box(): String { val r = nativeBox(B())