Index: tests/ctrl-flow/.expect/ifwhileCtl.txt
===================================================================
--- tests/ctrl-flow/.expect/ifwhileCtl.txt	(revision 1fb09eff3d4250c863e282b7c4a7ce6c64a492c4)
+++ tests/ctrl-flow/.expect/ifwhileCtl.txt	(revision 1fb09eff3d4250c863e282b7c4a7ce6c64a492c4)
@@ -0,0 +1,7 @@
+x != 0 correct
+x != 0 && y != 0 correct
+x == y correct
+s.i < 4 correct
+x != 0 correct
+x == y correct
+s.i < 4 correct
Index: tests/ctrl-flow/.expect/loop-inc.txt
===================================================================
--- tests/ctrl-flow/.expect/loop-inc.txt	(revision 1fb09eff3d4250c863e282b7c4a7ce6c64a492c4)
+++ tests/ctrl-flow/.expect/loop-inc.txt	(revision 1fb09eff3d4250c863e282b7c4a7ce6c64a492c4)
@@ -0,0 +1,3 @@
+loop
+loop
+done
Index: tests/ctrl-flow/.expect/loop_else.txt
===================================================================
--- tests/ctrl-flow/.expect/loop_else.txt	(revision 1fb09eff3d4250c863e282b7c4a7ce6c64a492c4)
+++ tests/ctrl-flow/.expect/loop_else.txt	(revision 1fb09eff3d4250c863e282b7c4a7ce6c64a492c4)
@@ -0,0 +1,64 @@
+empty
+empty
+empty
+
+false else
+
+else zero
+A else
+A A A A A A A A A A else
+A A A A A A A A A A A else
+B B B B B else
+C C C C C else
+D D D D D else
+E E E E E else
+
+0 1 2 3 4 5 6 7 8 9 else
+0 1 2 3 4 5 6 7 8 9 10 else
+1 3 5 7 9 else
+10 8 6 4 2 else
+0.5 1.5 2.5 3.5 4.5 else
+5.5 4.5 3.5 2.5 1.5 else
+2 4 6 8 10 else
+10 8 6 4 2 else
+
+1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1 0
+2 4 6 8 10
+2.1 3.8 5.5 7.2 8.9
+10 8 6 4 2 0
+12.1 10.4 8.7 7. 5.3 3.6
+
+N N N N N N N N N N else
+0 1 2 3 4 5 6 7 8 9 else
+0 1 2 3 4 5 6 7 8 9 10 else
+10 9 8 7 6 5 4 3 2 1 0 else
+
+3 6 9 else
+
+0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4 else
+0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14 else
+0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13 else
+0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23 else
+
+0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4 else
+0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14 else
+0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13 else
+0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23 else
+
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5 else
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5 else
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5 else
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
+
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)else
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)else
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)else
+
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)else
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)else
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)else
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)else
+
Index: tests/ctrl-flow/.expect/loopctrl.txt
===================================================================
--- tests/ctrl-flow/.expect/loopctrl.txt	(revision 1fb09eff3d4250c863e282b7c4a7ce6c64a492c4)
+++ tests/ctrl-flow/.expect/loopctrl.txt	(revision 1fb09eff3d4250c863e282b7c4a7ce6c64a492c4)
@@ -0,0 +1,109 @@
+empty
+empty
+empty
+
+zero
+A
+A A A A A A A A A A
+A A A A A A A A A A A
+B B B B B
+C C C C C
+D D D D D
+E E E E E
+
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+1 3 5 7 9
+10 8 6 4 2
+0.5 1.5 2.5 3.5 4.5
+5.5 4.5 3.5 2.5 1.5
+2 4 6 8 10
+10 8 6 4 2
+
+1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1 0
+2 4 6 8 10
+2.1 3.8 5.5 7.2 8.9
+10 8 6 4 2 0
+12.1 10.4 8.7 7. 5.3 3.6
+
+N N N N N N N N N N
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1 0
+
+3 6 9
+
+0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4
+0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14
+0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13
+0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23
+
+0 -5 1 -4 2 -3 3 -2 4 -1 5 0 6 1 7 2 8 3 9 4
+0 -5 1 -6 2 -7 3 -8 4 -9 5 -10 6 -11 7 -12 8 -13 9 -14
+0 -5 1 -3 2 -1 3 1 4 3 5 5 6 7 7 9 8 11 9 13
+0 -5 1 -7 2 -9 3 -11 4 -13 5 -15 6 -17 7 -19 8 -21 9 -23
+
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5
+0 -5 1.5 1 -7 2.5 2 -9 3.5 3 -11 4.5 4 -13 5.5 5 -15 6.5 6 -17 7.5 7 -19 8.5 8 -21 9.5 9 -23 10.5
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
+
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)
+(0 0)(1 1)(2 2)(3 3)(4 4)(5 5)(6 6)(7 7)(8 8)(9 9)(10 10)
+
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)
+(10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)
+
+A A A A A A A A A A
+B B B B B B B B B B B
+C C C C C C C C C C
+D D D D D D D D D D D
+A A A A A A A A A A
+B B B B B B B B B B B
+C C C C C C C C C C
+D D D D D D D D D D D
+A A A A A
+B B B B B B
+C C C C C
+D D D D D D
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1
+10 9 8 7 6 5 4 3 2 1 0
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1
+10 9 8 7 6 5 4 3 2 1 0
+0 2 4 6 8
+0 2 4 6 8 10
+10 8 6 4 2
+10 8 6 4 2 0
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1
+10 9 8 7 6 5 4 3 2 1 0
+0 1 2 3 4 5 6 7 8 9
+0 1 2 3 4 5 6 7 8 9 10
+10 9 8 7 6 5 4 3 2 1
+10 9 8 7 6 5 4 3 2 1 0
+0 2 4 6 8
+0 2 4 6 8 10
+10 8 6 4 2
+10 8 6 4 2 0
+0 1 2 3 4 5 6 7 8 9
+0 -1 -2 -3 -4 -5 -6 -7 -8 -9
+0 2 4 6 8
+0 -2 -4 -6 -8
+0 1 2 3 4 5 6 7 8 9
+0 2 4 6 8
+0 -2 -4 -6 -8
+0 2 4 6 8
+0 -2 -4 -6 -8
+0 1 2 3 4 5 6 7 8 9
