about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2015-06-19 16:34:11 -0700
committerKartik K. Agaram <vc@akkartik.com>2015-06-19 16:34:11 -0700
commita91c1c2a28583262cc6052a5c3d9e713e9b4c0e0 (patch)
treeeb9d9b38071275630e9533b2b02ddde048bae582
parentfc52705f4956df9a756b902b187f31799c1451a4 (diff)
downloadmu-a91c1c2a28583262cc6052a5c3d9e713e9b4c0e0.tar.gz
1599
-rw-r--r--045closure_name.cc12
-rw-r--r--060string.mu8
-rw-r--r--061channel.mu28
-rw-r--r--062array.mu6
-rw-r--r--071print.mu22
-rw-r--r--072scenario_screen.cc6
-rw-r--r--074keyboard.mu2
-rw-r--r--075scenario_keyboard.cc5
-rw-r--r--channel.mu2
-rw-r--r--chessboard.mu24
-rw-r--r--counters.mu8
-rw-r--r--repl.mu2
12 files changed, 62 insertions, 63 deletions
diff --git a/045closure_name.cc b/045closure_name.cc
index dd19c52e..6ae48847 100644
--- a/045closure_name.cc
+++ b/045closure_name.cc
@@ -6,14 +6,14 @@
 :(scenario closure)
 recipe main [
   default-space:address:array:location <- new location:type, 30:literal
-  1:address:array:location/names:init-counter <- init-counter
+  1:address:array:location/names:new-counter <- new-counter
 #?   $print [AAAAAAAAAAAAAAAA]
 #?   $print 1:address:array:location
-  2:number/raw <- increment-counter 1:address:array:location/names:init-counter
-  3:number/raw <- increment-counter 1:address:array:location/names:init-counter
+  2:number/raw <- increment-counter 1:address:array:location/names:new-counter
+  3:number/raw <- increment-counter 1:address:array:location/names:new-counter
 ]
 
-recipe init-counter [
+recipe new-counter [
   default-space:address:array:location <- new location:type, 30:literal
   x:number <- copy 23:literal
   y:number <- copy 3:literal  # variable that will be incremented
@@ -22,13 +22,13 @@ recipe init-counter [
 
 recipe increment-counter [
   default-space:address:array:location <- new location:type, 30:literal
-  0:address:array:location/names:init-counter <- next-ingredient  # outer space must be created by 'init-counter' above
+  0:address:array:location/names:new-counter <- next-ingredient  # outer space must be created by 'new-counter' above
   y:number/space:1 <- add y:number/space:1, 1:literal  # increment
   y:number <- copy 234:literal  # dummy
   reply y:number/space:1
 ]
 
-+name: recipe increment-counter is surrounded by init-counter
++name: recipe increment-counter is surrounded by new-counter
 +mem: storing 5 in location 3
 
 //: To make this work, compute the recipe that provides names for the
diff --git a/060string.mu b/060string.mu
index 97920366..4a4f6592 100644
--- a/060string.mu
+++ b/060string.mu
@@ -103,7 +103,7 @@ container buffer [
   data:address:array:character
 ]
 
-recipe init-buffer [
+recipe new-buffer [
   default-space:address:array:location <- new location:type, 30:literal
 #?   $print default-space:address:array:location, [
 #? ]
@@ -182,7 +182,7 @@ recipe buffer-append [
 scenario buffer-append-works [
   run [
     default-space:address:array:location <- new location:type, 30:literal
-    x:address:buffer <- init-buffer 3:literal
+    x:address:buffer <- new-buffer 3:literal
     s1:address:array:character <- get x:address:buffer/deref, data:offset
     x:address:buffer <- buffer-append x:address:buffer, 97:literal  # 'a'
     x:address:buffer <- buffer-append x:address:buffer, 98:literal  # 'b'
@@ -234,7 +234,7 @@ scenario buffer-append-works [
 scenario buffer-append-handles-backspace [
   run [
     default-space:address:array:location <- new location:type, 30:literal
-    x:address:buffer <- init-buffer 3:literal
+    x:address:buffer <- new-buffer 3:literal
     x:address:buffer <- buffer-append x:address:buffer, 97:literal  # 'a'
     x:address:buffer <- buffer-append x:address:buffer, 98:literal  # 'b'
     x:address:buffer <- buffer-append x:address:buffer, 8:literal/backspace
@@ -267,7 +267,7 @@ recipe integer-to-decimal-string [
     n:number <- multiply n:number, -1:literal
   }
   # add digits from right to left into intermediate buffer
-  tmp:address:buffer <- init-buffer 30:literal
+  tmp:address:buffer <- new-buffer 30:literal
   digit-base:number <- copy 48:literal  # '0'
   {
     done?:boolean <- equal n:number, 0:literal
diff --git a/061channel.mu b/061channel.mu
index e3f039dd..94c51df0 100644
--- a/061channel.mu
+++ b/061channel.mu
@@ -10,7 +10,7 @@
 
 scenario channel [
   run [
-    1:address:channel <- init-channel 3:literal/capacity
+    1:address:channel <- new-channel 3:literal/capacity
     1:address:channel <- write 1:address:channel, 34:literal
     2:number, 1:address:channel <- read 1:address:channel
   ]
@@ -31,8 +31,8 @@ container channel [
   data:address:array:location
 ]
 
-# result:address:channel <- init-channel capacity:number
-recipe init-channel [
+# result:address:channel <- new-channel capacity:number
+recipe new-channel [
   default-space:address:array:location <- new location:type, 30:literal
   # result = new channel
   result:address:channel <- new channel:type
@@ -119,7 +119,7 @@ recipe clear-channel [
 
 scenario channel-initialization [
   run [
-    1:address:channel <- init-channel 3:literal/capacity
+    1:address:channel <- new-channel 3:literal/capacity
     2:number <- get 1:address:channel/deref, first-full:offset
     3:number <- get 1:address:channel/deref, first-free:offset
   ]
@@ -131,7 +131,7 @@ scenario channel-initialization [
 
 scenario channel-write-increments-free [
   run [
-    1:address:channel <- init-channel 3:literal/capacity
+    1:address:channel <- new-channel 3:literal/capacity
     1:address:channel <- write 1:address:channel, 34:literal
     2:number <- get 1:address:channel/deref, first-full:offset
     3:number <- get 1:address:channel/deref, first-free:offset
@@ -144,7 +144,7 @@ scenario channel-write-increments-free [
 
 scenario channel-read-increments-full [
   run [
-    1:address:channel <- init-channel 3:literal/capacity
+    1:address:channel <- new-channel 3:literal/capacity
     1:address:channel <- write 1:address:channel, 34:literal
     _, 1:address:channel <- read 1:address:channel
     2:number <- get 1:address:channel/deref, first-full:offset
@@ -159,7 +159,7 @@ scenario channel-read-increments-full [
 scenario channel-wrap [
   run [
     # channel with just 1 slot
-    1:address:channel <- init-channel 1:literal/capacity
+    1:address:channel <- new-channel 1:literal/capacity
     # write and read a value
     1:address:channel <- write 1:address:channel, 34:literal
     _, 1:address:channel <- read 1:address:channel
@@ -226,7 +226,7 @@ recipe channel-capacity [
 
 scenario channel-new-empty-not-full [
   run [
-    1:address:channel <- init-channel 3:literal/capacity
+    1:address:channel <- new-channel 3:literal/capacity
     2:boolean <- channel-empty? 1:address:channel
     3:boolean <- channel-full? 1:address:channel
   ]
@@ -238,7 +238,7 @@ scenario channel-new-empty-not-full [
 
 scenario channel-write-not-empty [
   run [
-    1:address:channel <- init-channel 3:literal/capacity
+    1:address:channel <- new-channel 3:literal/capacity
     1:address:channel <- write 1:address:channel, 34:literal
     2:boolean <- channel-empty? 1:address:channel
     3:boolean <- channel-full? 1:address:channel
@@ -251,7 +251,7 @@ scenario channel-write-not-empty [
 
 scenario channel-write-full [
   run [
-    1:address:channel <- init-channel 1:literal/capacity
+    1:address:channel <- new-channel 1:literal/capacity
     1:address:channel <- write 1:address:channel, 34:literal
     2:boolean <- channel-empty? 1:address:channel
     3:boolean <- channel-full? 1:address:channel
@@ -264,7 +264,7 @@ scenario channel-write-full [
 
 scenario channel-read-not-full [
   run [
-    1:address:channel <- init-channel 1:literal/capacity
+    1:address:channel <- new-channel 1:literal/capacity
     1:address:channel <- write 1:address:channel, 34:literal
     _, 1:address:channel <- read 1:address:channel
     2:boolean <- channel-empty? 1:address:channel
@@ -286,7 +286,7 @@ recipe buffer-lines [
   out:address:channel <- next-ingredient
   # repeat forever
   {
-    line:address:buffer <- init-buffer, 30:literal
+    line:address:buffer <- new-buffer, 30:literal
     # read characters from 'in' until newline, copy into line
     {
       +next-character
@@ -351,8 +351,8 @@ recipe buffer-lines [
 
 scenario buffer-lines-blocks-until-newline [
   run [
-    1:address:channel/stdin <- init-channel 10:literal/capacity
-    2:address:channel/buffered-stdin <- init-channel 10:literal/capacity
+    1:address:channel/stdin <- new-channel 10:literal/capacity
+    2:address:channel/buffered-stdin <- new-channel 10:literal/capacity
     3:boolean <- channel-empty? 2:address:channel/buffered-stdin
     assert 3:boolean, [
 F buffer-lines-blocks-until-newline: channel should be empty after init]
diff --git a/062array.mu b/062array.mu
index 4369254a..9f1a5824 100644
--- a/062array.mu
+++ b/062array.mu
@@ -1,6 +1,6 @@
 scenario array-from-args [
   run [
-    1:address:array:location <- init-array 0:literal, 1:literal, 2:literal
+    1:address:array:location <- new-array 0:literal, 1:literal, 2:literal
     2:array:location <- copy 1:address:array:location/deref
   ]
   memory-should-contain [
@@ -12,7 +12,7 @@ scenario array-from-args [
 ]
 
 # create an array out of a list of scalar args
-recipe init-array [
+recipe new-array [
   default-space:address:array:location <- new location:type, 30:literal
   capacity:number <- copy 0:literal
   {
@@ -30,7 +30,7 @@ recipe init-array [
     done?:boolean <- greater-or-equal i:number, capacity:number
     break-if done?:boolean
     curr-value:location, exists?:boolean <- next-ingredient
-    assert exists?:boolean, [error in rewinding ingredients to init-array]
+    assert exists?:boolean, [error in rewinding ingredients to new-array]
     tmp:address:location <- index-address result:address:array:location/deref, i:number
     tmp:address:location/deref <- copy curr-value:location
     i:number <- add i:number, 1:literal
diff --git a/071print.mu b/071print.mu
index 6991b9f6..9fcfb018 100644
--- a/071print.mu
+++ b/071print.mu
@@ -14,7 +14,7 @@ container screen-cell [
   color:number
 ]
 
-recipe init-fake-screen [
+recipe new-fake-screen [
   default-space:address:array:location <- new location:type, 30:literal/capacity
   result:address:screen <- new screen:type
   width:address:number <- get-address result:address:screen/deref, num-columns:offset
@@ -151,7 +151,7 @@ recipe print-character [
 scenario print-character-at-top-left [
   run [
 #?     $start-tracing #? 3
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
     2:address:array:screen-cell <- get 1:address:screen/deref, data:offset
     3:array:screen-cell <- copy 2:address:array:screen-cell/deref
@@ -166,7 +166,7 @@ scenario print-character-at-top-left [
 
 scenario print-character-color [
   run [
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 97:literal/a, 1:literal/red
     2:address:array:screen-cell <- get 1:address:screen/deref, data:offset
     3:array:screen-cell <- copy 2:address:array:screen-cell/deref
@@ -182,7 +182,7 @@ scenario print-character-color [
 scenario print-backspace-character [
   run [
 #?     $start-tracing #? 3
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
     1:address:screen <- print-character 1:address:screen, 8:literal  # backspace
     2:number <- get 1:address:screen/deref, cursor-column:offset
@@ -200,7 +200,7 @@ scenario print-backspace-character [
 
 scenario print-extra-backspace-character [
   run [
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
     1:address:screen <- print-character 1:address:screen, 8:literal  # backspace
     1:address:screen <- print-character 1:address:screen, 8:literal  # backspace
@@ -219,7 +219,7 @@ scenario print-extra-backspace-character [
 
 scenario print-at-right-margin [
   run [
-    1:address:screen <- init-fake-screen 2:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 2:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
     1:address:screen <- print-character 1:address:screen, 98:literal  # 'b'
     1:address:screen <- print-character 1:address:screen, 99:literal  # 'c'
@@ -241,7 +241,7 @@ scenario print-at-right-margin [
 scenario print-newline-character [
   run [
 #?     $start-tracing #? 3
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
     1:address:screen <- print-character 1:address:screen, 10:literal/newline
     2:number <- get 1:address:screen/deref, cursor-row:offset
@@ -261,7 +261,7 @@ scenario print-newline-character [
 
 scenario print-newline-at-bottom-line [
   run [
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 10:literal/newline
     1:address:screen <- print-character 1:address:screen, 10:literal/newline
     1:address:screen <- print-character 1:address:screen, 10:literal/newline
@@ -276,7 +276,7 @@ scenario print-newline-at-bottom-line [
 
 scenario print-at-bottom-right [
   run [
-    1:address:screen <- init-fake-screen 2:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 2:literal/width, 2:literal/height
     1:address:screen <- print-character 1:address:screen, 10:literal/newline
     1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
     1:address:screen <- print-character 1:address:screen, 98:literal  # 'b'
@@ -369,7 +369,7 @@ recipe move-cursor [
 scenario clear-line-erases-printed-characters [
   run [
 #?     $start-tracing #? 4
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     # print a character
     1:address:screen <- print-character 1:address:screen, 97:literal  # 'a'
     # move cursor to start of line
@@ -558,7 +558,7 @@ recipe print-string [
 
 scenario print-string-stops-at-right-margin [
   run [
-    1:address:screen <- init-fake-screen 3:literal/width, 2:literal/height
+    1:address:screen <- new-fake-screen 3:literal/width, 2:literal/height
     2:address:array:character <- new [abcd]
     1:address:screen <- print-string 1:address:screen, 2:address:array:character
     3:address:array:screen-cell <- get 1:address:screen/deref, data:offset
diff --git a/072scenario_screen.cc b/072scenario_screen.cc
index b95e99eb..66febddc 100644
--- a/072scenario_screen.cc
+++ b/072scenario_screen.cc
@@ -130,16 +130,16 @@ Name[tmp_recipe.at(0)]["screen"] = SCREEN;
 
 :(before "End Rewrite Instruction(curr)")
 // rewrite `assume-screen width, height` to
-// `screen:address <- init-fake-screen width, height`
+// `screen:address <- new-fake-screen width, height`
 //? cout << "before: " << curr.to_string() << '\n'; //? 1
 if (curr.name == "assume-screen") {
-  curr.operation = Recipe_number["init-fake-screen"];
+  curr.operation = Recipe_number["new-fake-screen"];
   assert(curr.operation);
   assert(curr.products.empty());
   curr.products.push_back(reagent("screen:address"));
   curr.products.at(0).set_value(SCREEN);
 //? cout << "after: " << curr.to_string() << '\n'; //? 1
-//? cout << "AAA " << Recipe_number["init-fake-screen"] << '\n'; //? 1
+//? cout << "AAA " << Recipe_number["new-fake-screen"] << '\n'; //? 1
 }
 
 //: screen-should-contain is a regular instruction
diff --git a/074keyboard.mu b/074keyboard.mu
index 8d828882..0d348e55 100644
--- a/074keyboard.mu
+++ b/074keyboard.mu
@@ -7,7 +7,7 @@ container keyboard [
   data:address:array:character
 ]
 
-recipe init-fake-keyboard [
+recipe new-fake-keyboard [
   default-space:address:array:location <- new location:type, 30:literal
   result:address:keyboard <- new keyboard:type
   buf:address:address:array:character <- get-address result:address:keyboard/deref, data:offset
diff --git a/075scenario_keyboard.cc b/075scenario_keyboard.cc
index bb0d478b..83d13b40 100644
--- a/075scenario_keyboard.cc
+++ b/075scenario_keyboard.cc
@@ -39,7 +39,7 @@ if (s == "keyboard") return true;
 // rewrite `assume-keyboard string` to
 //   ```
 //   keyboard:address <- new string  # hacky reuse of location
-//   keyboard:address <- init-fake-keyboard keyboard:address
+//   keyboard:address <- new-fake-keyboard keyboard:address
 //   ```
 if (curr.name == "assume-keyboard") {
   // insert first instruction
@@ -50,8 +50,7 @@ if (curr.name == "assume-keyboard") {
   result.steps.push_back(curr);  // hacky that "Rewrite Instruction" is converting to multiple instructions
   // leave second instruction in curr
   curr.clear();
-  curr.operation = Recipe_number["init-fake-keyboard"];
-  curr.name = "init-fake-keyboard";
+  curr.operation = Recipe_number["new-fake-keyboard"];
   assert(curr.ingredients.empty());
   curr.ingredients.push_back(reagent("keyboard:address"));
   curr.ingredients.at(0).set_value(KEYBOARD);
diff --git a/channel.mu b/channel.mu
index 86378352..4f0231da 100644
--- a/channel.mu
+++ b/channel.mu
@@ -34,7 +34,7 @@ recipe consumer [
 
 recipe main [
   default-space:address:array:location <- new location:type, 30:literal
-  chan:address:channel <- init-channel 3:literal
+  chan:address:channel <- new-channel 3:literal
   # create two background 'routines' that communicate by a channel
   routine1:number <- start-running producer:recipe, chan:address:channel
   routine2:number <- start-running consumer:recipe, chan:address:channel
diff --git a/chessboard.mu b/chessboard.mu
index 77281a3e..8efe11e7 100644
--- a/chessboard.mu
+++ b/chessboard.mu
@@ -76,10 +76,10 @@ recipe chessboard [
 #? ] #? 1
   board:address:array:address:array:character <- initial-position
   # hook up stdin
-  stdin:address:channel <- init-channel 10:literal/capacity
+  stdin:address:channel <- new-channel 10:literal/capacity
   start-running send-keys-to-channel:recipe, keyboard:address, stdin:address:channel, screen:address
   # buffer lines in stdin
-  buffered-stdin:address:channel <- init-channel 10:literal/capacity
+  buffered-stdin:address:channel <- new-channel 10:literal/capacity
   start-running buffer-lines:recipe, stdin:address:channel, buffered-stdin:address:channel
   {
     msg:address:array:character <- new [Stupid text-mode chessboard. White pieces in uppercase; black pieces in lowercase. No checking for legal moves.
@@ -124,7 +124,7 @@ recipe chessboard [
 
 ## a board is an array of files, a file is an array of characters (squares)
 
-recipe init-board [
+recipe new-board [
   default-space:address:array:location <- new location:type, 30:literal
   initial-position:address:array:number <- next-ingredient
   # assert(length(initial-position) == 64)
@@ -138,14 +138,14 @@ recipe init-board [
     done?:boolean <- equal col:number, 8:literal
     break-if done?:boolean
     file:address:address:array:character <- index-address board:address:array:address:array:character/deref, col:number
-    file:address:address:array:character/deref <- init-file initial-position:address:array:number, col:number
+    file:address:address:array:character/deref <- new-file initial-position:address:array:number, col:number
     col:number <- add col:number, 1:literal
     loop
   }
   reply board:address:array:address:array:character
 ]
 
-recipe init-file [
+recipe new-file [
   default-space:address:array:location <- new location:type, 30:literal
   position:address:array:number <- next-ingredient
   index:number <- next-ingredient
@@ -224,7 +224,7 @@ recipe initial-position [
   #   B P _ _ _ _ p B
   #   N P _ _ _ _ p n
   #   R P _ _ _ _ p r
-  initial-position:address:array:number <- init-array 82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r, 78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n, 66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b, 81:literal/Q, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 113:literal/q, 75:literal/K, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 107:literal/k, 66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b, 78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n, 82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r
+  initial-position:address:array:number <- new-array 82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r, 78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n, 66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b, 81:literal/Q, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 113:literal/q, 75:literal/K, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 107:literal/k, 66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b, 78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n, 82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r
 #?       82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r,
 #?       78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n,
 #?       66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b, 
@@ -233,7 +233,7 @@ recipe initial-position [
 #?       66:literal/B, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 98:literal/b,
 #?       78:literal/N, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 110:literal/n,
 #?       82:literal/R, 80:literal/P, 32:literal/blank, 32:literal/blank, 32:literal/blank, 32:literal/blank, 112:literal/p, 114:literal/r
-  board:address:array:address:array:character <- init-board initial-position:address:array:number
+  board:address:array:address:array:character <- new-board initial-position:address:array:number
   reply board:address:array:address:array:character
 ]
 
@@ -428,7 +428,7 @@ scenario read-move-blocking [
   assume-screen 20:literal/width, 2:literal/height
   run [
 #?     $start-tracing #? 1
-    1:address:channel <- init-channel 2:literal
+    1:address:channel <- new-channel 2:literal
 #?     $print [aaa channel address: ], 1:address:channel, [ 
 #? ] #? 1
     2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address
@@ -521,7 +521,7 @@ F read-move-blocking: routine failed to terminate on newline]
 scenario read-move-quit [
   assume-screen 20:literal/width, 2:literal/height
   run [
-    1:address:channel <- init-channel 2:literal
+    1:address:channel <- new-channel 2:literal
     2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address
     # 'read-move' is waiting for input
     wait-for-routine 2:number
@@ -548,7 +548,7 @@ F read-move-quit: routine failed to terminate on 'q']
 scenario read-move-illegal-file [
   assume-screen 20:literal/width, 2:literal/height
   run [
-    1:address:channel <- init-channel 2:literal
+    1:address:channel <- new-channel 2:literal
     2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address
     # 'read-move' is waiting for input
     wait-for-routine 2:number
@@ -569,7 +569,7 @@ F read-move-file: routine failed to pause after coming up (before any keys were
 scenario read-move-illegal-rank [
   assume-screen 20:literal/width, 2:literal/height
   run [
-    1:address:channel <- init-channel 2:literal
+    1:address:channel <- new-channel 2:literal
     2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address
     # 'read-move' is waiting for input
     wait-for-routine 2:number
@@ -591,7 +591,7 @@ F read-move-file: routine failed to pause after coming up (before any keys were
 scenario read-move-empty [
   assume-screen 20:literal/width, 2:literal/height
   run [
-    1:address:channel <- init-channel 2:literal
+    1:address:channel <- new-channel 2:literal
     2:number/routine <- start-running read-move:recipe, 1:address:channel, screen:address
     # 'read-move' is waiting for input
     wait-for-routine 2:number
diff --git a/counters.mu b/counters.mu
index dab6850f..ba8c904f 100644
--- a/counters.mu
+++ b/counters.mu
@@ -1,7 +1,7 @@
 # example program: maintain multiple counters with isolated lexical scopes
 # (spaces)
 
-recipe init-counter [
+recipe new-counter [
   default-space:address:array:location <- new location:type, 30:literal
   n:number <- next-ingredient
   reply default-space:address:array:location
@@ -9,7 +9,7 @@ recipe init-counter [
 
 recipe increment-counter [
   default-space:address:array:location <- new location:type, 30:literal
-  0:address:array:location/names:init-counter <- next-ingredient  # setup outer space; it *must* come from 'init-counter'
+  0:address:array:location/names:new-counter <- next-ingredient  # setup outer space; it *must* come from 'new-counter'
   x:number <- next-ingredient
   n:number/space:1 <- add n:number/space:1, x:number
   reply n:number/space:1
@@ -18,9 +18,9 @@ recipe increment-counter [
 recipe main [
   default-space:address:array:location <- new location:type, 30:literal
   # counter A
-  a:address:array:location <- init-counter 34:literal
+  a:address:array:location <- new-counter 34:literal
   # counter B
-  b:address:array:location <- init-counter 23:literal
+  b:address:array:location <- new-counter 23:literal
   # increment both by 2 but in different ways
   increment-counter a:address:array:location, 1:literal
   b-value:number <- increment-counter b:address:array:location, 2:literal
diff --git a/repl.mu b/repl.mu
index c9a7aaca..67eb434a 100644
--- a/repl.mu
+++ b/repl.mu
@@ -59,7 +59,7 @@ recipe read-instruction [
   default-space:address:array:location <- new location:type, 60:literal
   k:address:keyboard <- next-ingredient
   x:address:screen <- next-ingredient
-  result:address:buffer <- init-buffer 10:literal  # string to maybe add to
+  result:address:buffer <- new-buffer 10:literal  # string to maybe add to
   trace [app], [read-instruction]
   # start state machine by calling slurp-regular-characters, which will return
   # by calling the complete continuation