3396

1 files changed, 24 insertions, 24 deletions

diff --git a/edit/006-sandbox-copy.mu b/edit/006-sandbox-copy.mu
index 642e17c2..f5c9f4cc 100644
--- a/edit/006-sandbox-copy.mu
+++ b/edit/006-sandbox-copy.mu
@@ -14,8 +14,8 @@ recipe foo [
   assume-console [
     press F4
   ]
-  3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text
-  event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
+  3:&:environment <- new-programming-environment screen:&:screen, 1:text, 2:text
+  event-loop screen:&:screen, console:&:console, 3:&:environment
   screen-should-contain [
     .                                                                                 run (F4)           .
     .                                                  ┊                                                 .
@@ -31,7 +31,7 @@ recipe foo [
     left-click 3, 69
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:environment
   ]
   # it copies into editor
   screen-should-contain [
@@ -49,7 +49,7 @@ recipe foo [
     type [0]
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:environment
   ]
   screen-should-contain [
     .                                                                                 run (F4)           .
@@ -76,8 +76,8 @@ recipe foo [
   assume-console [
     press F4
   ]
-  3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text
-  event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
+  3:&:environment <- new-programming-environment screen:&:screen, 1:text, 2:text
+  event-loop screen:&:screen, console:&:console, 3:&:environment
   screen-should-contain [
     .                                                                                 run (F4)           .
     .                                                  ┊                                                 .
@@ -93,7 +93,7 @@ recipe foo [
     left-click 3, 84
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:environment
   ]
   # it copies into editor
   screen-should-contain [
@@ -111,7 +111,7 @@ recipe foo [
     type [0]
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:environment
   ]
   screen-should-contain [
     .                                                                                 run (F4)           .
@@ -141,14 +141,14 @@ after <global-touch> [
 ]
 
 # some preconditions for attempting to copy a sandbox
-def should-attempt-copy? click-row:num, click-column:num, env:&:programming-environment-data -> result:bool [
+def should-attempt-copy? click-row:num, click-column:num, env:&:environment -> result:bool [
   local-scope
   load-ingredients
   # are we below the sandbox editor?
   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:&:editor-data <- get *env, current-sandbox:offset
+  first-sandbox:&:editor <- get *env, current-sandbox:offset
   assert first-sandbox, [!!]
   sandbox-left-margin:num <- get *first-sandbox, left:offset
   sandbox-right-margin:num <- get *first-sandbox, right:offset
@@ -156,19 +156,19 @@ def should-attempt-copy? click-row:num, click-column:num, env:&:programming-envi
   copy-button-vertical-area?:bool <- within-range? click-column, copy-button-left, copy-button-right
   reply-unless copy-button-vertical-area?, 0/false
   # finally, is sandbox editor empty?
-  current-sandbox:&:editor-data <- get *env, current-sandbox:offset
+  current-sandbox:&:editor <- get *env, current-sandbox:offset
   result <- empty-editor? current-sandbox
 ]
 
-def try-copy-sandbox click-row:num, env:&:programming-environment-data -> clicked-on-copy-button?:bool, env:&:programming-environment-data [
+def try-copy-sandbox click-row:num, env:&:environment -> clicked-on-copy-button?:bool, env:&:environment [
   local-scope
   load-ingredients
   # identify the sandbox to copy, if the click was actually on the 'copy' button
-  sandbox:&:sandbox-data <- find-sandbox env, click-row
+  sandbox:&:sandbox <- find-sandbox env, click-row
   return-unless sandbox, 0/false
   clicked-on-copy-button? <- copy 1/true
   text:text <- get *sandbox, data:offset
-  current-sandbox:&:editor-data <- get *env, current-sandbox:offset
+  current-sandbox:&:editor <- get *env, current-sandbox:offset
   current-sandbox <- insert-text current-sandbox, text
   # reset scroll
   *env <- put *env, render-from:offset, -1
@@ -176,10 +176,10 @@ def try-copy-sandbox click-row:num, env:&:programming-environment-data -> clicke
   *env <- put *env, sandbox-in-focus?:offset, 1/true
 ]
 
-def find-sandbox env:&:programming-environment-data, click-row:num -> result:&:sandbox-data [
+def find-sandbox env:&:environment, click-row:num -> result:&:sandbox [
   local-scope
   load-ingredients
-  curr-sandbox:&:sandbox-data <- get *env, sandbox:offset
+  curr-sandbox:&:sandbox <- get *env, sandbox:offset
   {
     break-unless curr-sandbox
     start:num <- get *curr-sandbox, starting-row-on-screen:offset
@@ -191,20 +191,20 @@ def find-sandbox env:&:programming-environment-data, click-row:num -> result:&:s
   return 0/not-found
 ]
 
-def click-on-sandbox-area? click-row:num, click-column:num, env:&:programming-environment-data -> result:bool [
+def click-on-sandbox-area? click-row:num, click-column:num, env:&:environment -> result:bool [
   local-scope
   load-ingredients
-  current-sandbox:&:editor-data <- get *env, current-sandbox:offset
+  current-sandbox:&:editor <- get *env, current-sandbox:offset
   sandbox-left-margin:num <- get *current-sandbox, left:offset
   on-sandbox-side?:bool <- greater-or-equal click-column, sandbox-left-margin
   return-unless on-sandbox-side?, 0/false
-  first-sandbox:&:sandbox-data <- get *env, sandbox:offset
+  first-sandbox:&:sandbox <- get *env, sandbox:offset
   return-unless first-sandbox, 0/false
   first-sandbox-begins:num <- get *first-sandbox, starting-row-on-screen:offset
   result <- greater-or-equal click-row, first-sandbox-begins
 ]
 
-def empty-editor? editor:&:editor-data -> result:bool [
+def empty-editor? editor:&:editor -> result:bool [
   local-scope
   load-ingredients
   head:&:duplex-list:char <- get *editor, data:offset
@@ -233,8 +233,8 @@ recipe foo [
   assume-console [
     press F4
   ]
-  3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text
-  event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
+  3:&:environment <- new-programming-environment screen:&:screen, 1:text, 2:text
+  event-loop screen:&:screen, console:&:console, 3:&:environment
   screen-should-contain [
     .                                                                                 run (F4)           .
     .                                                  ┊                                                 .
@@ -252,7 +252,7 @@ recipe foo [
     left-click 3, 70  # click 'copy' button
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:environment
   ]
   # copy doesn't happen
   screen-should-contain [
@@ -270,7 +270,7 @@ recipe foo [
     type [1]
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data
+    event-loop screen:&:screen, console:&:console, 3:&:environment
   ]
   screen-should-contain [
     .                                                                                 run (F4)           .