3391 - type abbreviations everywhere

Well, almost. I can't use them in some places in C++ where I'm just
creating a temporary reagent without passing it through transforms. Like
in some unit tests. I can't use them in memory-should-contain.

And there's one remaining bug: I can't use abbreviations in a couple of
places in 075channel.mu.

1 files changed, 39 insertions, 39 deletions

diff --git a/edit/007-sandbox-delete.mu b/edit/007-sandbox-delete.mu
index 3dac73f6..89c77a8c 100644
--- a/edit/007-sandbox-delete.mu
+++ b/edit/007-sandbox-delete.mu
@@ -5,7 +5,7 @@ scenario deleting-sandboxes [
   assume-screen 100/width, 15/height
   1:text <- new []
   2:text <- new []
-  3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:text, 2:text
+  3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text
   # run a few commands
   assume-console [
     left-click 1, 80
@@ -14,7 +14,7 @@ scenario deleting-sandboxes [
     type [add 2, 2]
     press F4
   ]
-  event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
+  event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
   screen-should-contain [
     .                                                                                 run (F4)           .
     .                                                  ┊                                                 .
@@ -35,7 +35,7 @@ scenario deleting-sandboxes [
     left-click 7, 85
   ]
   run [
-    event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
   ]
   screen-should-contain [
     .                                                                                 run (F4)           .
@@ -53,7 +53,7 @@ scenario deleting-sandboxes [
     left-click 3, 99
   ]
   run [
-    event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
   ]
   screen-should-contain [
     .                                                                                 run (F4)           .
@@ -67,7 +67,7 @@ scenario deleting-sandboxes [
 after <global-touch> [
   # support 'delete' button
   {
-    delete?:boolean <- should-attempt-delete? click-row, click-column, env
+    delete?:bool <- should-attempt-delete? click-row, click-column, env
     break-unless delete?
     delete?, env <- try-delete-sandbox click-row, env
     break-unless delete?
@@ -80,68 +80,68 @@ after <global-touch> [
 ]
 
 # some preconditions for attempting to delete a sandbox
-def should-attempt-delete? click-row:number, click-column:number, env:address:programming-environment-data -> result:boolean [
+def should-attempt-delete? click-row:num, click-column:num, env:&:programming-environment-data -> result:bool [
   local-scope
   load-ingredients
   # are we below the sandbox editor?
-  click-sandbox-area?:boolean <- click-on-sandbox-area? click-row, click-column, env
+  click-sandbox-area?:bool <- click-on-sandbox-area? click-row, click-column, env
   reply-unless click-sandbox-area?, 0/false
   # narrower, is the click in the columns spanning the 'copy' button?
-  first-sandbox:address:editor-data <- get *env, current-sandbox:offset
+  first-sandbox:&:editor-data <- get *env, current-sandbox:offset
   assert first-sandbox, [!!]
-  sandbox-left-margin:number <- get *first-sandbox, left:offset
-  sandbox-right-margin:number <- get *first-sandbox, right:offset
-  _, _, _, _, delete-button-left:number <- sandbox-menu-columns sandbox-left-margin, sandbox-right-margin
+  sandbox-left-margin:num <- get *first-sandbox, left:offset
+  sandbox-right-margin:num <- get *first-sandbox, right:offset
+  _, _, _, _, delete-button-left:num <- sandbox-menu-columns sandbox-left-margin, sandbox-right-margin
   result <- within-range? click-column, delete-button-left, sandbox-right-margin
 ]
 
-def try-delete-sandbox click-row:number, env:address:programming-environment-data -> clicked-on-delete-button?:boolean, env:address:programming-environment-data [
+def try-delete-sandbox click-row:num, env:&:programming-environment-data -> clicked-on-delete-button?:bool, env:&:programming-environment-data [
   local-scope
   load-ingredients
   # identify the sandbox to delete, if the click was actually on the 'delete' button
-  sandbox:address:sandbox-data <- find-sandbox env, click-row
+  sandbox:&:sandbox-data <- find-sandbox env, click-row
   return-unless sandbox, 0/false
   clicked-on-delete-button? <- copy 1/true
   env <- delete-sandbox env, sandbox
 ]
 
-def delete-sandbox env:address:programming-environment-data, sandbox:address:sandbox-data -> env:address:programming-environment-data [
+def delete-sandbox env:&:programming-environment-data, sandbox:&:sandbox-data -> env:&:programming-environment-data [
   local-scope
   load-ingredients
-  curr-sandbox:address:sandbox-data <- get *env, sandbox:offset
-  first-sandbox?:boolean <- equal curr-sandbox, sandbox
+  curr-sandbox:&:sandbox-data <- get *env, sandbox:offset
+  first-sandbox?:bool <- equal curr-sandbox, sandbox
   {
     # first sandbox? pop
     break-unless first-sandbox?
-    next-sandbox:address:sandbox-data <- get *curr-sandbox, next-sandbox:offset
+    next-sandbox:&:sandbox-data <- get *curr-sandbox, next-sandbox:offset
     *env <- put *env, sandbox:offset, next-sandbox
   }
   {
     # not first sandbox?
     break-if first-sandbox?
-    prev-sandbox:address:sandbox-data <- copy curr-sandbox
+    prev-sandbox:&:sandbox-data <- copy curr-sandbox
     curr-sandbox <- get *curr-sandbox, next-sandbox:offset
     {
       assert curr-sandbox, [sandbox not found! something is wrong.]
-      found?:boolean <- equal curr-sandbox, sandbox
+      found?:bool <- equal curr-sandbox, sandbox
       break-if found?
       prev-sandbox <- copy curr-sandbox
       curr-sandbox <- get *curr-sandbox, next-sandbox:offset
       loop
     }
     # snip sandbox out of its list
-    next-sandbox:address:sandbox-data <- get *curr-sandbox, next-sandbox:offset
+    next-sandbox:&:sandbox-data <- get *curr-sandbox, next-sandbox:offset
     *prev-sandbox <- put *prev-sandbox, next-sandbox:offset, next-sandbox
   }
   # update sandbox count
-  sandbox-count:number <- get *env, number-of-sandboxes:offset
+  sandbox-count:num <- get *env, number-of-sandboxes:offset
   sandbox-count <- subtract sandbox-count, 1
   *env <- put *env, number-of-sandboxes:offset, sandbox-count
   # reset scroll if deleted sandbox was last
   {
     break-if next-sandbox
-    render-from:number <- get *env, render-from:offset
-    reset-scroll?:boolean <- equal render-from, sandbox-count
+    render-from:num <- get *env, render-from:offset
+    reset-scroll?:bool <- equal render-from, sandbox-count
     break-unless reset-scroll?
     *env <- put *env, render-from:offset, -1
   }
@@ -153,8 +153,8 @@ scenario deleting-sandbox-after-scroll [
   # initialize environment
   1:text <- new []
   2:text <- new []
-  3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:text, 2:text
-  render-all screen, 3:address:programming-environment-data, render
+  3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text
+  render-all screen, 3:&:programming-environment-data, render
   # create 2 sandboxes and scroll to second
   assume-console [
     press ctrl-n
@@ -164,7 +164,7 @@ scenario deleting-sandbox-after-scroll [
     press F4
     press page-down
   ]
-  event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
+  event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
   screen-should-contain [
     .                                                                                 run (F4)           .
     .                                                  ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.
@@ -179,7 +179,7 @@ scenario deleting-sandbox-after-scroll [
     left-click 6, 99
   ]
   run [
-    event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
   ]
   # second sandbox shows in editor; scroll resets to display first sandbox
   screen-should-contain [
@@ -199,8 +199,8 @@ scenario deleting-top-sandbox-after-scroll [
   # initialize environment
   1:text <- new []
   2:text <- new []
-  3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:text, 2:text
-  render-all screen, 3:address:programming-environment-data, render
+  3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text
+  render-all screen, 3:&:programming-environment-data, render
   # create 2 sandboxes and scroll to second
   assume-console [
     press ctrl-n
@@ -210,7 +210,7 @@ scenario deleting-top-sandbox-after-scroll [
     press F4
     press page-down
   ]
-  event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
+  event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
   screen-should-contain [
     .                                                                                 run (F4)           .
     .                                                  ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.
@@ -225,7 +225,7 @@ scenario deleting-top-sandbox-after-scroll [
     left-click 2, 99
   ]
   run [
-    event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
   ]
   # second sandbox shows in editor; scroll resets to display first sandbox
   screen-should-contain [
@@ -245,8 +245,8 @@ scenario deleting-final-sandbox-after-scroll [
   # initialize environment
   1:text <- new []
   2:text <- new []
-  3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:text, 2:text
-  render-all screen, 3:address:programming-environment-data, render
+  3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text
+  render-all screen, 3:&:programming-environment-data, render
   # create 2 sandboxes and scroll to second
   assume-console [
     press ctrl-n
@@ -257,7 +257,7 @@ scenario deleting-final-sandbox-after-scroll [
     press page-down
     press page-down
   ]
-  event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
+  event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
   screen-should-contain [
     .                                                                                 run (F4)           .
     .                                                  ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.
@@ -272,7 +272,7 @@ scenario deleting-final-sandbox-after-scroll [
     left-click 2, 99
   ]
   run [
-    event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
   ]
   # implicitly scroll up to first sandbox
   screen-should-contain [
@@ -293,8 +293,8 @@ scenario deleting-updates-sandbox-count [
   # initialize environment
   1:text <- new []
   2:text <- new []
-  3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:text, 2:text
-  render-all screen, 3:address:programming-environment-data, render
+  3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text
+  render-all screen, 3:&:programming-environment-data, render
   # create 2 sandboxes
   assume-console [
     press ctrl-n
@@ -303,7 +303,7 @@ scenario deleting-updates-sandbox-count [
     type [add 1, 1]
     press F4
   ]
-  event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
+  event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
   screen-should-contain [
     .                                                                                 run (F4)           .
     .                                                  ┊                                                 .
@@ -323,7 +323,7 @@ scenario deleting-updates-sandbox-count [
     press page-down
   ]
   run [
-    event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
   ]
   # shouldn't go past last sandbox
   screen-should-contain [