Added/updated tests for LexicalScope.

compiler/testData/cfg/basic/Basic.instructions

@@ -18,10 +18,10 @@ fun f(a : Boolean) : Unit {
 }
 ---------------------
 L0:
-    <START>
+  1 <START>
     v(a : Boolean)
     w(a)
-    mark({ 1 a 2.toLong() foo(a, 3) genfun<Any>() flfun {1} 3.equals(4) 3 equals 4 1 + 2 a && true a || false })
+  2 mark({ 1 a 2.toLong() foo(a, 3) genfun<Any>() flfun {1} 3.equals(4) 3 equals 4 1 + 2 a && true a || false })
     r(1)
     r(a)
     mark(2.toLong())
@@ -65,7 +65,7 @@ L5:
 L6:
     r(a || false)                                                                                                   PREV:[jt(L6), r(false)]
 L1:
-    <END>                                                                                                           NEXT:[<SINK>]
+  1 <END>                                                                                                           NEXT:[<SINK>]
 error:
     <ERROR>                                                                                                         PREV:[]
 sink:
@@ -75,11 +75,11 @@ sink:
 {1}
 ---------------------
 L3:
-    <START>
-    mark(1)
+  3 <START>
+  4 mark(1)
     r(1)
 L4:
-    <END>      NEXT:[<SINK>]
+  3 <END>      NEXT:[<SINK>]
 error:
     <ERROR>    PREV:[]
 sink:
@@ -89,15 +89,15 @@ sink:
 fun foo(a : Boolean, b : Int) : Unit {}
 ---------------------
 L0:
-    <START>
+  1 <START>
     v(a : Boolean)
     w(a)
     v(b : Int)
     w(b)
-    mark({})
+  2 mark({})
     read (Unit)
 L1:
-    <END>             NEXT:[<SINK>]
+  1 <END>             NEXT:[<SINK>]
 error:
     <ERROR>           PREV:[]
 sink:
@@ -107,11 +107,11 @@ sink:
 fun genfun<T>() : Unit {}
 ---------------------
 L0:
-    <START>
-    mark({})
+  1 <START>
+  2 mark({})
     read (Unit)
 L1:
-    <END>          NEXT:[<SINK>]
+  1 <END>          NEXT:[<SINK>]
 error:
     <ERROR>        PREV:[]
 sink:
@@ -121,13 +121,13 @@ sink:
 fun flfun(f : () -> Any) : Unit {}
 ---------------------
 L0:
-    <START>
+  1 <START>
     v(f : () -> Any)
     w(f)
-    mark({})
+  2 mark({})
     read (Unit)
 L1:
-    <END>               NEXT:[<SINK>]
+  1 <END>               NEXT:[<SINK>]
 error:
     <ERROR>             PREV:[]
 sink:

compiler/testData/cfg/basic/EmptyFunction.instructions

@@ -2,11 +2,11 @@
 fun empty() {}
 ---------------------
 L0:
-    <START>
-    mark({})
+  1 <START>
+  2 mark({})
     read (Unit)
 L1:
-    <END>          NEXT:[<SINK>]
+  1 <END>          NEXT:[<SINK>]
 error:
     <ERROR>        PREV:[]
 sink:

compiler/testData/cfg/basic/ShortFunction.instructions

@@ -2,7 +2,7 @@
 fun short() = 1
 ---------------------
 L0:
-    <START>
+  1 <START>
     r(1)
 L1:
     <END>      NEXT:[<SINK>]