use the new x' everywhere it's applicable

you may infer from the size of the CL that we've been wanting this for QUITE A WHILE

Force-Push: yes
Change-Id: Iaa6ff8f40bd4020a75b81aadd87874cc8d512123

1 files changed, 15 insertions, 15 deletions

diff --git a/language/dynamic/flow-control.e b/language/dynamic/flow-control.e
index d4a9dd3..a8ebc3d 100644
--- a/language/dynamic/flow-control.e
+++ b/language/dynamic/flow-control.e
@@ -33,12 +33,12 @@
   swap here @ swap here ! swap
   ~ (old here, length)
 
-  ' lit entry-to-execution-token , 0 ,
-  ' != entry-to-execution-token ,
+  x' lit , 0 ,
+  x' != ,
 
   ~   The branch length needs to be one word longer than the block length,
   ~ because the length field itself is part of the scope of the branch.
-  ' 0branch entry-to-execution-token , dup 8 + ,
+  x' 0branch , dup 8 + ,
   ~ (old here, length)
 
   drop 5 8 * + here !
@@ -53,11 +53,11 @@
   ~ (start pointer, length)
   swap here @ swap here ! swap
   ~ (old here, length)
-  ' lit entry-to-execution-token , 0 ,
-  ' = entry-to-execution-token ,
+  x' lit , 0 ,
+  x' = ,
   ~   The branch length needs to be one word longer than the block length,
   ~ because the length field itself is part of the scope of the branch.
-  ' 0branch entry-to-execution-token , dup 8 + ,
+  x' 0branch , dup 8 + ,
   ~ (old here, length)
   drop 5 8 * + here ! ; make-immediate
 
@@ -79,16 +79,16 @@
   ~   Now we write out the initial test-and-branch.
   4 roll dup 5 unroll here @ 6 unroll here !
   ~ (old here, true start, true length, false start, false length)
-  ' lit entry-to-execution-token , 0 ,
-  ' != entry-to-execution-token ,
+  x' lit , 0 ,
+  x' != ,
   ~   Branch past the length field, the true-block, and the unconditional
   ~ branch in the middle.
-  ' 0branch entry-to-execution-token ,
+  x' 0branch ,
   3roll dup 4 unroll 3 8 * + ,
 
   ~  Next, write out the unconditional branch in the middle.
   swap dup 3unroll 5 8 * + here !
-  ' branch entry-to-execution-token ,
+  x' branch ,
   ~  Branch past the length field and the false-block.
   dup 8 + ,
 
@@ -99,7 +99,7 @@
 
 ~ (start, length --)
 : forever
-  ' branch entry-to-execution-token , 8 + -1 * , drop
+  x' branch , 8 + -1 * , drop
   ; make-immediate
 
 
@@ -113,17 +113,17 @@
   2dup swap dup 5 8 * + 3roll memmove
   here @ 5 unroll swap dup 3unroll here !
   ~ (old here, test start, test length, body start, body length)
-  ' lit entry-to-execution-token , 0 ,
-  ' != entry-to-execution-token ,
+  x' lit , 0 ,
+  x' != ,
   ~ Branch past the length field, the body, and the unconditional branch.
-  ' 0branch entry-to-execution-token ,
+  x' 0branch ,
   dup 3 8 * + ,
   ~ Set "here" to the new end.
   5 8 * 6 roll + here !
   ~ (test start, test length, body start, body length)
   ~   Unconditionally branch backwards past the branch word, the body, the
   ~ conditional branch, and the test.
-  ' branch entry-to-execution-token ,
+  x' branch ,
   6 8 * + swap drop + swap drop -1 * ,
   ; make-immediate