diff options
Diffstat (limited to 'sandbox/010-sandbox-trace.mu')
-rw-r--r-- | sandbox/010-sandbox-trace.mu | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sandbox/010-sandbox-trace.mu b/sandbox/010-sandbox-trace.mu index 96e346c8..dd1aed15 100644 --- a/sandbox/010-sandbox-trace.mu +++ b/sandbox/010-sandbox-trace.mu @@ -8,8 +8,8 @@ scenario sandbox-click-on-code-toggles-app-trace [ assume-console [ press F4 ] - 2:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text - event-loop screen:&:screen, console:&:console, 2:&:programming-environment-data + 2:&:environment <- new-programming-environment screen:&:screen, 1:text + event-loop screen:&:screen, console:&:console, 2:&:environment screen-should-contain [ . run (F4) . . . @@ -24,7 +24,7 @@ scenario sandbox-click-on-code-toggles-app-trace [ left-click 4, 21 ] run [ - event-loop screen:&:screen, console:&:console, 2:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 2:&:environment 4:char/cursor-icon <- copy 9251/␣ print screen:&:screen, 4:char/cursor-icon ] @@ -50,7 +50,7 @@ scenario sandbox-click-on-code-toggles-app-trace [ left-click 4, 25 ] run [ - event-loop screen:&:screen, console:&:console, 2:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 2:&:environment print screen:&:screen, 4:char/cursor-icon ] # trace hidden again @@ -74,8 +74,8 @@ add 2, 2] assume-console [ press F4 ] - 2:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text - event-loop screen:&:screen, console:&:console, 2:&:programming-environment-data + 2:&:environment <- new-programming-environment screen:&:screen, 1:text + event-loop screen:&:screen, console:&:console, 2:&:environment screen-should-contain [ . run (F4) . . . @@ -92,7 +92,7 @@ add 2, 2] left-click 4, 21 ] run [ - event-loop screen:&:screen, console:&:console, 2:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 2:&:environment ] # trace now printed above result screen-should-contain [ @@ -118,8 +118,8 @@ scenario clicking-on-app-trace-does-nothing [ press F4 left-click 4, 1 ] - 2:&:programming-environment-data <- new-programming-environment screen:&:screen, 1:text - event-loop screen:&:screen, console:&:console, 2:&:programming-environment-data + 2:&:environment <- new-programming-environment screen:&:screen, 1:text + event-loop screen:&:screen, console:&:console, 2:&:environment screen-should-contain [ . run (F4) . . . @@ -133,7 +133,7 @@ scenario clicking-on-app-trace-does-nothing [ left-click 5, 7 ] run [ - event-loop screen:&:screen, console:&:console, 2:&:programming-environment-data + event-loop screen:&:screen, console:&:console, 2:&:environment ] # no change; doesn't die screen-should-contain [ @@ -146,13 +146,13 @@ scenario clicking-on-app-trace-does-nothing [ ] ] -container sandbox-data [ +container sandbox [ trace:text display-trace?:bool ] # replaced in a later layer -def! update-sandbox sandbox:&:sandbox-data, env:&:programming-environment-data, idx:num -> sandbox:&:sandbox-data, env:&:programming-environment-data [ +def! update-sandbox sandbox:&:sandbox, env:&:environment, idx:num -> sandbox:&:sandbox, env:&:environment [ local-scope load-ingredients data:text <- get *sandbox, data:offset @@ -170,14 +170,14 @@ after <global-touch> [ click-column:num <- get t, column:offset on-sandbox-side?:bool <- greater-or-equal click-column, sandbox-left-margin break-unless on-sandbox-side? - first-sandbox:&:sandbox-data <- get *env, sandbox:offset + first-sandbox:&:sandbox <- get *env, sandbox:offset break-unless first-sandbox first-sandbox-begins:num <- get *first-sandbox, starting-row-on-screen:offset click-row:num <- get t, row:offset below-sandbox-editor?:bool <- greater-or-equal click-row, first-sandbox-begins break-unless below-sandbox-editor? # identify the sandbox whose code is being clicked on - sandbox:&:sandbox-data <- find-click-in-sandbox-code env, click-row + sandbox:&:sandbox <- find-click-in-sandbox-code env, click-row break-unless sandbox # toggle its display-trace? property x:bool <- get *sandbox, display-trace?:offset @@ -192,7 +192,7 @@ after <global-touch> [ } ] -def find-click-in-sandbox-code env:&:programming-environment-data, click-row:num -> sandbox:&:sandbox-data [ +def find-click-in-sandbox-code env:&:environment, click-row:num -> sandbox:&:sandbox [ local-scope load-ingredients # assert click-row >= sandbox.starting-row-on-screen @@ -202,7 +202,7 @@ def find-click-in-sandbox-code env:&:programming-environment-data, click-row:num assert clicked-on-sandboxes?, [extract-sandbox called on click to sandbox editor] # while click-row < sandbox.next-sandbox.starting-row-on-screen { - next-sandbox:&:sandbox-data <- get *sandbox, next-sandbox:offset + next-sandbox:&:sandbox <- get *sandbox, next-sandbox:offset break-unless next-sandbox next-start:num <- get *next-sandbox, starting-row-on-screen:offset found?:bool <- lesser-than click-row, next-start |