Added/updated tests for LexicalScope.

compiler/testData/cfg/arrays/ArrayAccess.instructions

@@ -10,8 +10,8 @@ fun foo() {
 }
 ---------------------
 L0:
-    <START>
-    mark({ val a = Array<Int> 3 a[10] = 4 2 a[10] 100 a[10] += 1 })
+  1 <START>
+  2 mark({ val a = Array<Int> 3 a[10] = 4 2 a[10] 100 a[10] += 1 })
     v(val a = Array<Int>)
     mark(Array<Int>)
     call(Array, <init>)
@@ -41,7 +41,7 @@ L0:
     r(1)
     call(a[10], set)
 L1:
-    <END>                                                              NEXT:[<SINK>]
+  1 <END>                                                              NEXT:[<SINK>]
 error:
     <ERROR>                                                            PREV:[]
 sink:

compiler/testData/cfg/arrays/ArrayOfFunctions.instructions

@@ -4,10 +4,10 @@ fun test(array: Array<(Int)->Unit>) {
 }
 ---------------------
 L0:
-    <START>
+  1 <START>
     v(array: Array<(Int)->Unit>)
     w(array)
-    mark({ array[11](3) })
+  2 mark({ array[11](3) })
     mark(array[11](3))
     mark(array[11])
     r(array)
@@ -16,7 +16,7 @@ L0:
     r(3)
     call(array[11], <for expression array[11]>)
 L1:
-    <END>                                          NEXT:[<SINK>]
+  1 <END>                                          NEXT:[<SINK>]
 error:
     <ERROR>                                        PREV:[]
 sink:

compiler/testData/cfg/arrays/arrayAccessExpression.instructions

@@ -4,7 +4,7 @@ abstract class Ab {
 }
 ---------------------
 L0:
-    <START>
+  1 <START>
 L1:
     <END>      NEXT:[<SINK>]
 error:
@@ -16,7 +16,7 @@ sink:
 abstract fun getArray() : Array<Int>
 ---------------------
 L0:
-    <START>
+  1 <START>
 L1:
     <END>      NEXT:[<SINK>]
 error:
@@ -30,10 +30,10 @@ fun test(ab: Ab) {
 }
 ---------------------
 L0:
-    <START>
+  1 <START>
     v(ab: Ab)
     w(ab)
-    mark({ ab.getArray()[1] })
+  2 mark({ ab.getArray()[1] })
     mark(ab.getArray()[1])
     mark(ab.getArray())
     mark(getArray())
@@ -42,7 +42,7 @@ L0:
     r(1)
     call(ab.getArray()[1], get)
 L1:
-    <END>                          NEXT:[<SINK>]
+  1 <END>                          NEXT:[<SINK>]
 error:
     <ERROR>                        PREV:[]
 sink:

compiler/testData/cfg/arrays/arraySet.instructions

@@ -4,17 +4,17 @@ fun foo(a: Array<Int>) {
 }
 ---------------------
 L0:
-    <START>
+  1 <START>
     v(a: Array<Int>)
     w(a)
-    mark({ a[1] = 2 })
+  2 mark({ a[1] = 2 })
     mark(a[1])
     r(a)
     r(1)
     r(2)
     call(a[1], set)
 L1:
-    <END>                 NEXT:[<SINK>]
+  1 <END>                 NEXT:[<SINK>]
 error:
     <ERROR>               PREV:[]
 sink:

compiler/testData/cfg/arrays/arraySetPlusAssign.instructions

@@ -4,10 +4,10 @@ fun foo(a: Array<Int>) {
 }
 ---------------------
 L0:
-    <START>
+  1 <START>
     v(a: Array<Int>)
     w(a)
-    mark({ a[0] += 1 })
+  2 mark({ a[0] += 1 })
     mark(a[0] += 1)
     mark(a[0])
     r(a)
@@ -21,7 +21,7 @@ L0:
     r(1)
     call(a[0], set)
 L1:
-    <END>                  NEXT:[<SINK>]
+  1 <END>                  NEXT:[<SINK>]
 error:
     <ERROR>                PREV:[]
 sink: