about summary refs log tree commit diff stats
path: root/edit/008-sandbox-test.mu
diff options
context:
space:
mode:
Diffstat (limited to 'edit/008-sandbox-test.mu')
-rw-r--r--edit/008-sandbox-test.mu36
1 files changed, 18 insertions, 18 deletions
diff --git a/edit/008-sandbox-test.mu b/edit/008-sandbox-test.mu
index c35cf802..98d1bf57 100644
--- a/edit/008-sandbox-test.mu
+++ b/edit/008-sandbox-test.mu
@@ -4,17 +4,17 @@ scenario sandbox-click-on-result-toggles-color-to-green [
   trace-until 100/app  # trace too long
   assume-screen 40/width, 10/height
   # basic recipe
-  1:address:shared:array:character <- new [ 
+  1:address:array:character <- new [ 
 recipe foo [
   reply 4
 ]]
   # run it
-  2:address:shared:array:character <- new [foo]
+  2:address:array:character <- new [foo]
   assume-console [
     press F4
   ]
-  3:address:shared:programming-environment-data <- new-programming-environment screen:address:shared:screen, 1:address:shared:array:character, 2:address:shared:array:character
-  event-loop screen:address:shared:screen, console:address:shared:console, 3:address:shared:programming-environment-data
+  3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:address:array:character, 2:address:array:character
+  event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
   screen-should-contain [
     .                     run (F4)           .
     .                    ┊                   .
@@ -30,7 +30,7 @@ recipe foo [
     left-click 5, 21
   ]
   run [
-    event-loop screen:address:shared:screen, console:address:shared:console, 3:address:shared:programming-environment-data
+    event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
   ]
   # color toggles to green
   screen-should-contain-in-color 2/green, [
@@ -46,7 +46,7 @@ recipe foo [
   # cursor should remain unmoved
   run [
     4:character/cursor <- copy 9251/␣
-    print screen:address:shared:screen, 4:character/cursor
+    print screen:address:screen, 4:character/cursor
   ]
   screen-should-contain [
     .                     run (F4)           .
@@ -67,7 +67,7 @@ recipe foo [
     press F4
   ]
   run [
-    event-loop screen:address:shared:screen, console:address:shared:console, 3:address:shared:programming-environment-data
+    event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data
   ]
   # result turns red
   screen-should-contain-in-color 1/red, [
@@ -85,13 +85,13 @@ recipe foo [
 # this requires tracking a couple more things
 container sandbox-data [
   response-starting-row-on-screen:number
-  expected-response:address:shared:array:character
+  expected-response:address:array:character
 ]
 
 # include expected response when saving or restoring a sandbox
 before <end-save-sandbox> [
   {
-    expected-response:address:shared:array:character <- get *curr, expected-response:offset
+    expected-response:address:array:character <- get *curr, expected-response:offset
     break-unless expected-response
     filename <- append filename, [.out]
     save filename, expected-response
@@ -110,14 +110,14 @@ after <global-touch> [
     click-column:number <- get t, column:offset
     on-sandbox-side?:boolean <- greater-or-equal click-column, sandbox-left-margin
     break-unless on-sandbox-side?
-    first-sandbox:address:shared:sandbox-data <- get *env, sandbox:offset
+    first-sandbox:address:sandbox-data <- get *env, sandbox:offset
     break-unless first-sandbox
     first-sandbox-begins:number <- get *first-sandbox, starting-row-on-screen:offset
     click-row:number <- get t, row:offset
     below-sandbox-editor?:boolean <- greater-or-equal click-row, first-sandbox-begins
     break-unless below-sandbox-editor?
     # identify the sandbox whose output is being clicked on
-    sandbox:address:shared:sandbox-data <- find-click-in-sandbox-output env, click-row
+    sandbox:address:sandbox-data <- find-click-in-sandbox-output env, click-row
     break-unless sandbox
     # toggle its expected-response, and save session
     sandbox <- toggle-expected-response sandbox
@@ -131,17 +131,17 @@ after <global-touch> [
   }
 ]
 
-def find-click-in-sandbox-output env:address:shared:programming-environment-data, click-row:number -> sandbox:address:shared:sandbox-data [
+def find-click-in-sandbox-output env:address:programming-environment-data, click-row:number -> sandbox:address:sandbox-data [
   local-scope
   load-ingredients
   # assert click-row >= sandbox.starting-row-on-screen
-  sandbox:address:shared:sandbox-data <- get *env, sandbox:offset
+  sandbox:address:sandbox-data <- get *env, sandbox:offset
   start:number <- get *sandbox, starting-row-on-screen:offset
   clicked-on-sandboxes?:boolean <- greater-or-equal click-row, start
   assert clicked-on-sandboxes?, [extract-sandbox called on click to sandbox editor]
   # while click-row < sandbox.next-sandbox.starting-row-on-screen
   {
-    next-sandbox:address:shared:sandbox-data <- get *sandbox, next-sandbox:offset
+    next-sandbox:address:sandbox-data <- get *sandbox, next-sandbox:offset
     break-unless next-sandbox
     next-start:number <- get *next-sandbox, starting-row-on-screen:offset
     found?:boolean <- lesser-than click-row, next-start
@@ -157,10 +157,10 @@ def find-click-in-sandbox-output env:address:shared:programming-environment-data
   return sandbox
 ]
 
-def toggle-expected-response sandbox:address:shared:sandbox-data -> sandbox:address:shared:sandbox-data [
+def toggle-expected-response sandbox:address:sandbox-data -> sandbox:address:sandbox-data [
   local-scope
   load-ingredients
-  expected-response:address:shared:array:character <- get *sandbox, expected-response:offset
+  expected-response:address:array:character <- get *sandbox, expected-response:offset
   {
     # if expected-response is set, reset
     break-unless expected-response
@@ -169,7 +169,7 @@ def toggle-expected-response sandbox:address:shared:sandbox-data -> sandbox:addr
   {
     # if not, set expected response to the current response
     break-if expected-response
-    response:address:shared:array:character <- get *sandbox, response:offset
+    response:address:array:character <- get *sandbox, response:offset
     *sandbox <- put *sandbox, expected-response:offset, response
   }
 ]
@@ -179,7 +179,7 @@ after <render-sandbox-response> [
   {
     break-unless sandbox-response
     *sandbox <- put *sandbox, response-starting-row-on-screen:offset, row
-    expected-response:address:shared:array:character <- get *sandbox, expected-response:offset
+    expected-response:address:array:character <- get *sandbox, expected-response:offset
     break-unless expected-response  # fall-through to print in grey
     response-is-expected?:boolean <- equal expected-response, sandbox-response
     {