diff options
Diffstat (limited to 'edit/008-sandbox-edit.mu')
| -rw-r--r-- | edit/008-sandbox-edit.mu | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/edit/008-sandbox-edit.mu b/edit/008-sandbox-edit.mu index 9a8c767f..034c1a37 100644 --- a/edit/008-sandbox-edit.mu +++ b/edit/008-sandbox-edit.mu @@ -13,8 +13,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) . . ┊ . @@ -30,7 +30,7 @@ recipe foo [ left-click 3, 55 ] run [ - event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 3:&:environment ] # it pops back into editor screen-should-contain [ @@ -47,7 +47,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) . @@ -73,8 +73,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) . . ┊ . @@ -90,7 +90,7 @@ recipe foo [ left-click 3, 68 ] run [ - event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 3:&:environment ] # it pops back into editor screen-should-contain [ @@ -107,7 +107,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) . @@ -136,14 +136,14 @@ after <global-touch> [ ] # some preconditions for attempting to edit a sandbox -def should-attempt-edit? click-row:num, click-column:num, env:&:programming-environment-data -> result:bool [ +def should-attempt-edit? 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 'edit' 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 @@ -151,20 +151,20 @@ def should-attempt-edit? click-row:num, click-column:num, env:&:programming-envi edit-button-vertical-area?:bool <- within-range? click-column, edit-button-left, edit-button-right reply-unless edit-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-edit-sandbox click-row:num, env:&:programming-environment-data -> clicked-on-edit-button?:bool, env:&:programming-environment-data [ +def try-edit-sandbox click-row:num, env:&:environment -> clicked-on-edit-button?:bool, env:&:environment [ local-scope load-ingredients # identify the sandbox to edit, if the click was actually on the 'edit' button - sandbox:&:sandbox-data <- find-sandbox env, click-row + sandbox:&:sandbox <- find-sandbox env, click-row return-unless sandbox, 0/false clicked-on-edit-button? <- copy 1/true # 'edit' button = 'copy' button + 'delete' button 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 env <- delete-sandbox env, sandbox # reset scroll @@ -180,12 +180,12 @@ scenario sandbox-with-print-can-be-edited [ 1:text <- new [] # right editor contains an instruction 2:text <- new [print-integer screen, 4] - 3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text + 3:&:environment <- new-programming-environment screen:&:screen, 1:text, 2:text # run the sandbox assume-console [ press F4 ] - event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 3:&:environment screen-should-contain [ . run (F4) . . ┊ . @@ -206,7 +206,7 @@ scenario sandbox-with-print-can-be-edited [ left-click 3, 65 ] run [ - event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 3:&:environment ] screen-should-contain [ . run (F4) . @@ -223,8 +223,8 @@ scenario editing-sandbox-after-scrolling-resets-scroll [ # initialize environment 1:text <- new [] 2:text <- new [] - 3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text - render-all screen, 3:&:programming-environment-data, render + 3:&:environment <- new-programming-environment screen:&:screen, 1:text, 2:text + render-all screen, 3:&:environment, render # create 2 sandboxes and scroll to second assume-console [ press ctrl-n @@ -235,7 +235,7 @@ scenario editing-sandbox-after-scrolling-resets-scroll [ press page-down press page-down ] - event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 3:&:environment screen-should-contain [ . run (F4) . . ┊━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. @@ -250,7 +250,7 @@ scenario editing-sandbox-after-scrolling-resets-scroll [ left-click 2, 55 ] run [ - event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 3:&:environment ] # second sandbox shows in editor; scroll resets to display first sandbox screen-should-contain [ @@ -271,8 +271,8 @@ scenario editing-sandbox-updates-sandbox-count [ # initialize environment 1:text <- new [] 2:text <- new [] - 3:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text, 2:text - render-all screen, 3:&:programming-environment-data, render + 3:&:environment <- new-programming-environment screen:&:screen, 1:text, 2:text + render-all screen, 3:&:environment, render # create 2 sandboxes assume-console [ press ctrl-n @@ -281,7 +281,7 @@ scenario editing-sandbox-updates-sandbox-count [ type [add 1, 1] press F4 ] - event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 3:&:environment screen-should-contain [ . run (F4) . . ┊ . @@ -300,7 +300,7 @@ scenario editing-sandbox-updates-sandbox-count [ press F4 ] run [ - event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 3:&:environment ] # no change in contents screen-should-contain [ @@ -322,7 +322,7 @@ scenario editing-sandbox-updates-sandbox-count [ press page-down ] run [ - event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 3:&:environment ] # screen should show just final sandbox with the right index (1) screen-should-contain [ |