Migrate boxInline tests to new multi-file framework

compiler/testData/codegen/boxInline/syntheticAccessors/constField.2.kt

@@ -1,11 +0,0 @@
-package test
-
-private const val packageProp = "O"
-
-internal inline fun packageInline(p: (String) -> String): String {
-    return p(packageProp)
-}
-
-internal fun samePackageCall(): String {
-    return packageInline { it + "K"}
-}

compiler/testData/codegen/boxInline/syntheticAccessors/constField.kt

@@ -1,3 +1,19 @@
+// FILE: 1.kt
+
+package test
+
+private const val packageProp = "O"
+
+internal inline fun packageInline(p: (String) -> String): String {
+    return p(packageProp)
+}
+
+internal fun samePackageCall(): String {
+    return packageInline { it + "K"}
+}
+
+// FILE: 2.kt
+
 import test.*
 
 fun box(): String {

compiler/testData/codegen/boxInline/syntheticAccessors/packagePrivateMembers.2.kt

@@ -1,13 +0,0 @@
-package test
-
-private val packageProp = "O"
-
-private fun packageFun() = "K"
-
-internal inline fun packageInline(p: (String, String) -> String): String {
-    return p(packageProp, packageFun())
-}
-
-internal fun samePackageCall(): String {
-    return packageInline { s, s2 -> s + s2 }
-}

compiler/testData/codegen/boxInline/syntheticAccessors/packagePrivateMembers.kt

@@ -1,3 +1,21 @@
+// FILE: 1.kt
+
+package test
+
+private val packageProp = "O"
+
+private fun packageFun() = "K"
+
+internal inline fun packageInline(p: (String, String) -> String): String {
+    return p(packageProp, packageFun())
+}
+
+internal fun samePackageCall(): String {
+    return packageInline { s, s2 -> s + s2 }
+}
+
+// FILE: 2.kt
+
 import test.*
 
 fun box(): String {

compiler/testData/codegen/boxInline/syntheticAccessors/propertyModifiers.1.kt

@@ -1,10 +0,0 @@
-import test.*
-
-fun box() : String {
-    val p = P()
-
-    if (p.testPrivate() != "OK") return "fail 1 ${p.testPrivate()}"
-
-    if (p.testFinal() != "OK") return "fail 2 ${p.testFinal()}"
-    return "OK"
-}

compiler/testData/codegen/boxInline/syntheticAccessors/propertyModifiers.kt

@@ -1,3 +1,5 @@
+// FILE: 1.kt
+
 package test
 
 class P {
@@ -20,4 +22,17 @@ class P {
     fun testFinal(): String {
         return fooFinal()
     }
-}
+}
+
+// FILE: 2.kt
+
+import test.*
+
+fun box() : String {
+    val p = P()
+
+    if (p.testPrivate() != "OK") return "fail 1 ${p.testPrivate()}"
+
+    if (p.testFinal() != "OK") return "fail 2 ${p.testFinal()}"
+    return "OK"
+}

compiler/testData/codegen/boxInline/syntheticAccessors/protectedMembers.1.kt

@@ -1,15 +0,0 @@
-import test.*
-
-class A: P() {
-    override val FOO: String
-        get() = "fail"
-
-    override fun test(): String {
-        return "fail"
-    }
-}
-
-fun box() : String {
-    val p = P()
-    return p.protectedProp() + p.protectedFun()
-}

compiler/testData/codegen/boxInline/syntheticAccessors/protectedMembers.2.kt

@@ -1,16 +0,0 @@
-package test
-
-open class P {
-    protected open val FOO = "O"
-
-    protected open fun test() = "K"
-
-    inline fun protectedProp(): String {
-        return FOO
-    }
-
-    inline fun protectedFun(): String {
-        return test()
-    }
-}
-

compiler/testData/codegen/boxInline/syntheticAccessors/protectedMembers.kt

@@ -0,0 +1,35 @@
+// FILE: 1.kt
+
+package test
+
+open class P {
+    protected open val FOO = "O"
+
+    protected open fun test() = "K"
+
+    inline fun protectedProp(): String {
+        return FOO
+    }
+
+    inline fun protectedFun(): String {
+        return test()
+    }
+}
+
+// FILE: 2.kt
+
+import test.*
+
+class A: P() {
+    override val FOO: String
+        get() = "fail"
+
+    override fun test(): String {
+        return "fail"
+    }
+}
+
+fun box() : String {
+    val p = P()
+    return p.protectedProp() + p.protectedFun()
+}

compiler/testData/codegen/boxInline/syntheticAccessors/protectedMembersFromSuper.1.kt

@@ -1,15 +0,0 @@
-import test.*
-
-class A: P() {
-    override val FOO: String
-        get() = "fail"
-
-    override fun test(): String {
-        return "fail"
-    }
-}
-
-fun box() : String {
-    val p = P()
-    return p.protectedProp() + p.protectedFun()
-}

compiler/testData/codegen/boxInline/syntheticAccessors/protectedMembersFromSuper.kt

@@ -1,3 +1,5 @@
+// FILE: 1.kt
+
 package test
 
 open class Base {
@@ -17,3 +19,20 @@ open class P : Base() {
     }
 }
 
+// FILE: 2.kt
+
+import test.*
+
+class A: P() {
+    override val FOO: String
+        get() = "fail"
+
+    override fun test(): String {
+        return "fail"
+    }
+}
+
+fun box() : String {
+    val p = P()
+    return p.protectedProp() + p.protectedFun()
+}

compiler/testData/codegen/boxInline/syntheticAccessors/superCall.1.kt

@@ -1,5 +0,0 @@
-import test.*
-
-fun box(): String {
-    return X.doTest()
-}

compiler/testData/codegen/boxInline/syntheticAccessors/superCall.kt

@@ -1,3 +1,5 @@
+// FILE: 1.kt
+
 package test
 
 open class A {
@@ -13,3 +15,11 @@ object X : A() {
         return super.test()
     }
 }
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    return X.doTest()
+}

compiler/testData/codegen/boxInline/syntheticAccessors/superProperty.1.kt

@@ -1,5 +0,0 @@
-import test.*
-
-fun box(): String {
-    return X.doTest()
-}

compiler/testData/codegen/boxInline/syntheticAccessors/superProperty.kt

@@ -1,3 +1,5 @@
+// FILE: 1.kt
+
 package test
 
 open class A {
@@ -12,3 +14,11 @@ object X : A() {
         return super.test
     }
 }
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    return X.doTest()
+}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/directFieldAccess.2.kt

@@ -1,5 +0,0 @@
-package test
-
-inline fun call(s: () -> String): String {
-    return s()
-}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/directFieldAccess.kt

@@ -1,3 +1,13 @@
+// FILE: 1.kt
+
+package test
+
+inline fun call(s: () -> String): String {
+    return s()
+}
+
+// FILE: 2.kt
+
 import test.*
 
 class A {
@@ -22,4 +32,4 @@ fun box(): String {
     val a = A()
     if (a.test1() != "OK") return "fail 1: ${a.test1()}"
     return a.test2()
-}
+}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/directFieldAccessInCrossInline.2.kt

@@ -1,5 +0,0 @@
-package test
-
-inline fun call(crossinline s: () -> String): String {
-    return { s() } ()
-}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/directFieldAccessInCrossInline.kt

@@ -1,3 +1,13 @@
+// FILE: 1.kt
+
+package test
+
+inline fun call(crossinline s: () -> String): String {
+    return { s() } ()
+}
+
+// FILE: 2.kt
+
 //NO_CHECK_LAMBDA_INLINING
 import test.*
 
@@ -23,4 +33,4 @@ fun box(): String {
     val a = A()
     if (a.test1() != "OK") return "fail 1: ${a.test1()}"
     return a.test2()
-}
+}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/privateCall.2.kt

@@ -1,5 +0,0 @@
-package test
-
-inline fun call(s: () -> String): String {
-    return s()
-}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/privateCall.kt

@@ -1,3 +1,13 @@
+// FILE: 1.kt
+
+package test
+
+inline fun call(s: () -> String): String {
+    return s()
+}
+
+// FILE: 2.kt
+
 import test.*
 
 class A {
@@ -25,4 +35,4 @@ fun box(): String {
     val a = A()
     if (a.test1() != "OK") return "fail 1: ${a.test1()}"
     return a.test2()
-}
+}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/privateInCrossInline.2.kt

@@ -1,7 +0,0 @@
-package test
-
-inline fun call(crossinline s: () -> String): String {
-    return {
-        s()
-    }()
-}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/privateInCrossInline.kt

@@ -1,3 +1,15 @@
+// FILE: 1.kt
+
+package test
+
+inline fun call(crossinline s: () -> String): String {
+    return {
+        s()
+    }()
+}
+
+// FILE: 2.kt
+
 //NO_CHECK_LAMBDA_INLINING
 import test.*
 
@@ -26,4 +38,4 @@ fun box(): String {
     val a = A()
     if (a.test1() != "OK") return "fail 1: ${a.test1()}"
     return a.test2()
-}
+}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/superCall.2.kt

@@ -1,12 +0,0 @@
-package test
-
-inline fun call(s: () -> String): String {
-    return s()
-}
-
-open class Base {
-
-    protected open fun method(): String = "O"
-
-    protected open val prop = "K"
-}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/superCall.kt

@@ -1,3 +1,20 @@
+// FILE: 1.kt
+
+package test
+
+inline fun call(s: () -> String): String {
+    return s()
+}
+
+open class Base {
+
+    protected open fun method(): String = "O"
+
+    protected open val prop = "K"
+}
+
+// FILE: 2.kt
+
 import test.*
 
 class A : Base() {
@@ -25,4 +42,4 @@ fun box(): String {
     val a = A()
     if (a.test1() != "OK") return "fail 1: ${a.test1()}"
     return a.test2()
-}
+}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/superInCrossInline.2.kt

@@ -1,14 +0,0 @@
-package test
-
-inline fun call(crossinline s: () -> String): String {
-    return {
-        s()
-    }()
-}
-
-open class Base {
-
-    protected open fun method(): String = "O"
-
-    protected open val prop = "K"
-}

compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/superInCrossInline.kt

@@ -1,3 +1,22 @@
+// FILE: 1.kt
+
+package test
+
+inline fun call(crossinline s: () -> String): String {
+    return {
+        s()
+    }()
+}
+
+open class Base {
+
+    protected open fun method(): String = "O"
+
+    protected open val prop = "K"
+}
+
+// FILE: 2.kt
+
 //NO_CHECK_LAMBDA_INLINING
 import test.*
 
@@ -26,4 +45,4 @@ fun box(): String {
     val a = A()
     if (a.test1() != "OK") return "fail 1: ${a.test1()}"
     return a.test2()
-}
+}