diff options
Diffstat (limited to 'edit/005-sandbox.mu')
| -rw-r--r-- | edit/005-sandbox.mu | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/edit/005-sandbox.mu b/edit/005-sandbox.mu index 74ca5742..44cb9975 100644 --- a/edit/005-sandbox.mu +++ b/edit/005-sandbox.mu @@ -40,13 +40,13 @@ scenario run-and-show-results [ 1:address:array:character <- new [] # sandbox editor contains an instruction without storing outputs 2:address:array:character <- new [divide-with-remainder 11, 3] - 3:address:programming-environment-data <- new-programming-environment screen:address, 1:address:array:character, 2:address:array:character + 3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:address:array:character, 2:address:array:character # run the code in the editors assume-console [ press F4 ] run [ - event-loop screen:address, console:address, 3:address:programming-environment-data + event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data ] # check that screen prints the results screen-should-contain [ @@ -89,7 +89,7 @@ scenario run-and-show-results [ press F4 ] run [ - event-loop screen:address, console:address, 3:address:programming-environment-data + event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data ] # check that screen prints the results screen-should-contain [ @@ -132,7 +132,7 @@ after <global-keypress> [ recipe run-sandboxes [ local-scope env:address:programming-environment-data <- next-ingredient - screen:address <- next-ingredient + screen:address:screen <- next-ingredient stop?:boolean, env, screen <- update-recipes env, screen reply-if stop?, 1/errors-found, env/same-as-ingredient:0, screen/same-as-ingredient:1 # check contents of right editor (sandbox) @@ -174,7 +174,7 @@ recipe run-sandboxes [ recipe update-recipes [ local-scope env:address:programming-environment-data <- next-ingredient - screen:address <- next-ingredient + screen:address:screen <- next-ingredient recipes:address:editor-data <- get *env, recipes:offset in:address:array:character <- editor-contents recipes save [recipes.mu], in # newlayer: persistence @@ -194,7 +194,7 @@ recipe update-sandbox [ recipe update-status [ local-scope - screen:address <- next-ingredient + screen:address:screen <- next-ingredient msg:address:array:character <- next-ingredient color:number <- next-ingredient screen <- move-cursor screen, 0, 2 @@ -230,7 +230,7 @@ recipe save-sandboxes [ recipe! render-sandbox-side [ local-scope - screen:address <- next-ingredient + screen:address:screen <- next-ingredient env:address:programming-environment-data <- next-ingredient trace 11, [app], [render sandbox side] current-sandbox:address:editor-data <- get *env, current-sandbox:offset @@ -248,7 +248,7 @@ recipe! render-sandbox-side [ recipe render-sandboxes [ local-scope - screen:address <- next-ingredient + screen:address:screen <- next-ingredient sandbox:address:sandbox-data <- next-ingredient left:number <- next-ingredient right:number <- next-ingredient @@ -331,12 +331,12 @@ recipe restore-sandboxes [ reply env/same-as-ingredient:0 ] -# row, screen <- render-screen screen:address, sandbox-screen:address, left:number, right:number, row:number +# row, screen <- render-screen screen:address:screen, sandbox-screen:address, left:number, right:number, row:number # print the fake sandbox screen to 'screen' with appropriate delimiters # leave cursor at start of next line recipe render-screen [ local-scope - screen:address <- next-ingredient + screen:address:screen <- next-ingredient s:address:screen <- next-ingredient left:number <- next-ingredient right:number <- next-ingredient @@ -413,12 +413,12 @@ z:number <- add 2, 2 ]] # sandbox editor contains an instruction without storing outputs 2:address:array:character <- new [foo] - 3:address:programming-environment-data <- new-programming-environment screen:address, 1:address:array:character, 2:address:array:character + 3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:address:array:character, 2:address:array:character # run the code in the editors assume-console [ press F4 ] - event-loop screen:address, console:address, 3:address:programming-environment-data + event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data screen-should-contain [ . run (F4) . . ┊ . @@ -437,7 +437,7 @@ z:number <- add 2, 2 press F4 ] run [ - event-loop screen:address, console:address, 3:address:programming-environment-data + event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data ] # check that screen updates the result on the right screen-should-contain [ @@ -459,13 +459,13 @@ scenario run-instruction-manages-screen-per-sandbox [ 1:address:array:character <- new [] # right editor contains an instruction 2:address:array:character <- new [print-integer screen, 4] - 3:address:programming-environment-data <- new-programming-environment screen:address, 1:address:array:character, 2:address:array:character + 3:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:address:array:character, 2:address:array:character # run the code in the editor assume-console [ press F4 ] run [ - event-loop screen:address, console:address, 3:address:programming-environment-data + event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data ] # check that it prints a little toy screen screen-should-contain [ @@ -508,13 +508,13 @@ recipe editor-contents [ scenario editor-provides-edited-contents [ assume-screen 10/width, 5/height 1:address:array:character <- new [abc] - 2:address:editor-data <- new-editor 1:address:array:character, screen:address, 0/left, 10/right + 2:address:editor-data <- new-editor 1:address:array:character, screen:address:screen, 0/left, 10/right assume-console [ left-click 1, 2 type [def] ] run [ - editor-event-loop screen:address, console:address, 2:address:editor-data + editor-event-loop screen:address:screen, console:address:console, 2:address:editor-data 3:address:array:character <- editor-contents 2:address:editor-data 4:array:character <- copy *3:address:array:character ] |