Script refactoring, codegen tests: change test data according to semantics change

Add some new tests for uncovered cases

compiler/testData/codegen/script/adder.kts

@@ -0,0 +1,5 @@
+var x = 0
+x++
+x++
+x++
+// expected: x: 3

compiler/testData/codegen/script/empty.kts

@@ -1,2 +1 @@
-
+// expected: rv: <nofield>
-// expected: rv: null

compiler/testData/codegen/script/helloWorld.kts

@@ -1,2 +1,2 @@
-// expected: rv: null
+// expected: rv: <nofield>
-System.out!!.println("hello world")
+System.out!!.println("hello world")

compiler/testData/codegen/script/inline.kts

@@ -11,4 +11,4 @@ fun main(): Int {
     return foo { x -> bar(x) }
 }
 
-main()
+val rv = main()

compiler/testData/codegen/script/outerCapture.kts

@@ -11,4 +11,4 @@ fun main(): Int {
     return foo { x -> bar(x) }
 }
 
-main()
+val rv = main()

compiler/testData/codegen/script/parameter.kts

@@ -2,4 +2,4 @@
 // param: what: kotlin.String: sky
 // param: color: kotlin.String: blue
 
-"$what color is $color"
+val rv = "$what color is $color"

compiler/testData/codegen/script/parameterArray.kts

@@ -1,4 +1,4 @@
 // param: args: kotlin.Array<kotlin.String>: three little words
 // expected: rv: little
 
-args[1]
+val rv = args[1]

compiler/testData/codegen/script/parameterClosure.kts

@@ -2,6 +2,6 @@
 
 fun addX(y: Int) = x + y
 
-addX(3)
+val rv = addX(3)
 
 // expected: rv: 13

compiler/testData/codegen/script/parameterLong.kts

@@ -2,4 +2,4 @@
 // param: aa: kotlin.Long: 17
 // param: bb: kotlin.Int: 2
 
-aa + bb
+val rv = aa + bb

compiler/testData/codegen/script/secondLevelFunction.kts

@@ -1,10 +1,10 @@
-val x: Int
+var x: Int = 0
 
 if (true) {
     fun foo(y: Int) = y + 20
     x = foo(9)
 }
 
-x
+val rv = x
 
 // expected: rv: 29

compiler/testData/codegen/script/secondLevelFunctionClosure.kts

@@ -1,11 +1,11 @@
 val z = 30
-val x: Int
+var x: Int = 0
 
 if (true) {
     fun foo() = z + 20
     x = foo()
 }
 
-x
+val rv = x
 
 // expected: rv: 50

compiler/testData/codegen/script/secondLevelVal.kts

@@ -2,7 +2,4 @@ if (true) {
     val archenemy = "Jim Moriarty"
 }
 
-true
-
-// expected: rv: true
 // expected: archenemy: <nofield>

compiler/testData/codegen/script/simpleClass.kts

@@ -2,6 +2,6 @@ class SimpleClass(val s: String) {
     fun foo() = s
 }
 
-SimpleClass("OK").foo()
+val rv = SimpleClass("OK").foo()
 
 // expected: rv: OK

compiler/testData/codegen/script/string.kts

@@ -1,3 +1,3 @@
-"O" + "K"
+val rv = "O" + "K"
 
 // expected: rv: OK

compiler/testData/codegen/script/topLevelFunction.kts

@@ -8,4 +8,4 @@ fun factorial(n: Int): Int {
     return product
 }
 
-factorial(10)
+val rv = factorial(10)

compiler/testData/codegen/script/topLevelFunctionClosure.kts

@@ -2,6 +2,6 @@ val x = 12
 
 fun foo(y: Int) = x + y
 
-foo(33)
+val rv = foo(33)
 
 // expected: rv: 45

compiler/testData/codegen/scriptCustom/fibwprunner.kts

@@ -1,4 +1,3 @@
 val fibwp = test.Fibwp(5)
 val callResult = fibwp.fib(4)
-val result = fibwp.num  + fibwp.result - 5
+val result = fibwp.num  + fibwp.result - 5
-fibwp.rv

compiler/testData/repl/analyzeErrors.repl

@@ -1,6 +1,6 @@
 >>> fun foo() = 765
 >>> foo(1)
-error: too many arguments for public final fun foo(): kotlin.Int defined in <script>
+error: too many arguments for public final fun foo(): kotlin.Int defined in Line1
 foo(1)
     ^
 >>> foo()

compiler/testData/repl/classes/classReferencesVal.repl

@@ -0,0 +1,6 @@
+>>> val c = "OK"
+>>> inner class A {
+...     fun foo() = c
+... }
+>>> A().foo()
+OK

compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java

@@ -31,6 +31,12 @@ import java.util.regex.Pattern;
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class ScriptCodegenTestGenerated extends AbstractScriptCodegenTest {
+    @TestMetadata("adder.kts")
+    public void testAdder() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/adder.kts");
+        doTest(fileName);
+    }
+
     public void testAllFilesPresentInScript() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/script"), Pattern.compile("^(.+)\\.kts$"), true);
     }

compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java

@@ -69,10 +69,8 @@ public class ScriptGenTest extends CodegenTestCase {
         Method resultMethod = aClass.getDeclaredMethod("getResult");
         assertTrue((resultMethod.getModifiers() & Opcodes.ACC_FINAL) != 0);
         assertTrue((resultMethod.getModifiers() & Opcodes.ACC_PUBLIC) != 0);
-        Field rv = aClass.getField("rv");
         assertTrue((result.getModifiers() & Opcodes.ACC_PRIVATE) != 0);
         Object script = constructor.newInstance();
-        assertEquals(12, rv.get(script));
         assertEquals(8, result.get(script));
         assertEquals(8, resultMethod.invoke(script));
     }

compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java

@@ -133,6 +133,12 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
             doTest(fileName);
         }
 
+        @TestMetadata("classReferencesVal.repl")
+        public void testClassReferencesVal() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/classes/classReferencesVal.repl");
+            doTest(fileName);
+        }
+
         @TestMetadata("emptyClass.repl")
         public void testEmptyClass() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/classes/emptyClass.repl");