diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2016-04-24 11:54:30 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2016-04-24 11:54:30 -0700 |
commit | b0bf5321de2ba32f3b92c2faf6b7b68a06b6b432 (patch) | |
tree | 9e0473bddd0d9a2d4aec7ac58dec8d85c2833a5d /sandbox/007-sandbox-delete.mu | |
parent | 15936c91a9f8023dc868a021029f84b45aa50176 (diff) | |
download | mu-b0bf5321de2ba32f3b92c2faf6b7b68a06b6b432.tar.gz |
2864 - replace all address:shared with just address
Now that we no longer have non-shared addresses, we can just always track refcounts for all addresses. Phew!
Diffstat (limited to 'sandbox/007-sandbox-delete.mu')
-rw-r--r-- | sandbox/007-sandbox-delete.mu | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/sandbox/007-sandbox-delete.mu b/sandbox/007-sandbox-delete.mu index 2fed31cd..1f0f03b4 100644 --- a/sandbox/007-sandbox-delete.mu +++ b/sandbox/007-sandbox-delete.mu @@ -3,8 +3,8 @@ scenario deleting-sandboxes [ trace-until 100/app # trace too long assume-screen 50/width, 15/height - 1:address:shared:array:character <- new [] - 2:address:shared:programming-environment-data <- new-programming-environment screen:address:shared:screen, 1:address:shared:array:character + 1:address:array:character <- new [] + 2:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:address:array:character # run a few commands assume-console [ left-click 1, 0 @@ -13,7 +13,7 @@ scenario deleting-sandboxes [ type [add 2, 2] press F4 ] - event-loop screen:address:shared:screen, console:address:shared:console, 2:address:shared:programming-environment-data + event-loop screen:address:screen, console:address:console, 2:address:programming-environment-data screen-should-contain [ . run (F4) . . . @@ -34,7 +34,7 @@ scenario deleting-sandboxes [ left-click 7, 49 ] run [ - event-loop screen:address:shared:screen, console:address:shared:console, 2:address:shared:programming-environment-data + event-loop screen:address:screen, console:address:console, 2:address:programming-environment-data ] screen-should-contain [ . run (F4) . @@ -52,7 +52,7 @@ scenario deleting-sandboxes [ left-click 3, 49 ] run [ - event-loop screen:address:shared:screen, console:address:shared:console, 2:address:shared:programming-environment-data + event-loop screen:address:screen, console:address:console, 2:address:programming-environment-data ] screen-should-contain [ . run (F4) . @@ -76,29 +76,29 @@ after <global-touch> [ } ] -def delete-sandbox t:touch-event, env:address:shared:programming-environment-data -> was-delete?:boolean, env:address:shared:programming-environment-data [ +def delete-sandbox t:touch-event, env:address:programming-environment-data -> was-delete?:boolean, env:address:programming-environment-data [ local-scope load-ingredients click-column:number <- get t, column:offset - current-sandbox:address:shared:editor-data <- get *env, current-sandbox:offset + current-sandbox:address:editor-data <- get *env, current-sandbox:offset right:number <- get *current-sandbox, right:offset at-right?:boolean <- equal click-column, right return-unless at-right?, 0/false click-row:number <- get t, row:offset { - first:address:shared:sandbox-data <- get *env, sandbox:offset + first:address:sandbox-data <- get *env, sandbox:offset reply-unless first, 0/false target-row:number <- get *first, starting-row-on-screen:offset delete-first?:boolean <- equal target-row, click-row break-unless delete-first? - new-first:address:shared:sandbox-data <- get *first, next-sandbox:offset + new-first:address:sandbox-data <- get *first, next-sandbox:offset *env <- put *env, sandbox:offset, new-first env <- fixup-delete env, new-first return 1/true # force rerender } - prev:address:shared:sandbox-data <- get *env, sandbox:offset + prev:address:sandbox-data <- get *env, sandbox:offset assert prev, [failed to find any sandboxes!] - curr:address:shared:sandbox-data <- get *prev, next-sandbox:offset + curr:address:sandbox-data <- get *prev, next-sandbox:offset { break-unless curr # more sandboxes to check @@ -107,7 +107,7 @@ def delete-sandbox t:touch-event, env:address:shared:programming-environment-dat delete-curr?:boolean <- equal target-row, click-row break-unless delete-curr? # delete this sandbox - next:address:shared:sandbox-data <- get *curr, next-sandbox:offset + next:address:sandbox-data <- get *curr, next-sandbox:offset *prev <- put *prev, next-sandbox:offset, next env <- fixup-delete env, next return 1/true # force rerender @@ -119,7 +119,7 @@ def delete-sandbox t:touch-event, env:address:shared:programming-environment-dat return 0/false ] -def fixup-delete env:address:shared:programming-environment-data, next:address:shared:sandbox-data -> env:address:shared:programming-environment-data [ +def fixup-delete env:address:programming-environment-data, next:address:sandbox-data -> env:address:programming-environment-data [ local-scope load-ingredients # update sandbox count @@ -141,9 +141,9 @@ scenario deleting-sandbox-after-scroll [ trace-until 100/app # trace too long assume-screen 30/width, 10/height # initialize environment - 1:address:shared:array:character <- new [] - 2:address:shared:programming-environment-data <- new-programming-environment screen:address:shared:screen, 1:address:shared:array:character - render-all screen, 2:address:shared:programming-environment-data + 1:address:array:character <- new [] + 2:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:address:array:character + render-all screen, 2:address:programming-environment-data # create 2 sandboxes and scroll to second assume-console [ press ctrl-n @@ -153,7 +153,7 @@ scenario deleting-sandbox-after-scroll [ press F4 press down-arrow ] - event-loop screen:address:shared:screen, console:address:shared:console, 2:address:shared:programming-environment-data + event-loop screen:address:screen, console:address:console, 2:address:programming-environment-data screen-should-contain [ . . # menu .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. @@ -171,7 +171,7 @@ scenario deleting-sandbox-after-scroll [ left-click 6, 29 ] run [ - event-loop screen:address:shared:screen, console:address:shared:console, 2:address:shared:programming-environment-data + event-loop screen:address:screen, console:address:console, 2:address:programming-environment-data ] # second sandbox shows in editor; scroll resets to display first sandbox screen-should-contain [ @@ -189,9 +189,9 @@ scenario deleting-top-sandbox-after-scroll [ trace-until 100/app # trace too long assume-screen 30/width, 10/height # initialize environment - 1:address:shared:array:character <- new [] - 2:address:shared:programming-environment-data <- new-programming-environment screen:address:shared:screen, 1:address:shared:array:character - render-all screen, 2:address:shared:programming-environment-data + 1:address:array:character <- new [] + 2:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:address:array:character + render-all screen, 2:address:programming-environment-data # create 2 sandboxes and scroll to second assume-console [ press ctrl-n @@ -201,7 +201,7 @@ scenario deleting-top-sandbox-after-scroll [ press F4 press down-arrow ] - event-loop screen:address:shared:screen, console:address:shared:console, 2:address:shared:programming-environment-data + event-loop screen:address:screen, console:address:console, 2:address:programming-environment-data screen-should-contain [ . . # menu .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. @@ -219,7 +219,7 @@ scenario deleting-top-sandbox-after-scroll [ left-click 2, 29 ] run [ - event-loop screen:address:shared:screen, console:address:shared:console, 2:address:shared:programming-environment-data + event-loop screen:address:screen, console:address:console, 2:address:programming-environment-data ] # second sandbox shows in editor; scroll resets to display first sandbox screen-should-contain [ @@ -237,9 +237,9 @@ scenario deleting-final-sandbox-after-scroll [ trace-until 100/app # trace too long assume-screen 30/width, 10/height # initialize environment - 1:address:shared:array:character <- new [] - 2:address:shared:programming-environment-data <- new-programming-environment screen:address:shared:screen, 1:address:shared:array:character - render-all screen, 2:address:shared:programming-environment-data + 1:address:array:character <- new [] + 2:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:address:array:character + render-all screen, 2:address:programming-environment-data # create 2 sandboxes and scroll to second assume-console [ press ctrl-n @@ -250,7 +250,7 @@ scenario deleting-final-sandbox-after-scroll [ press down-arrow press down-arrow ] - event-loop screen:address:shared:screen, console:address:shared:console, 2:address:shared:programming-environment-data + event-loop screen:address:screen, console:address:console, 2:address:programming-environment-data screen-should-contain [ . . .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━. @@ -265,7 +265,7 @@ scenario deleting-final-sandbox-after-scroll [ left-click 2, 29 ] run [ - event-loop screen:address:shared:screen, console:address:shared:console, 2:address:shared:programming-environment-data + event-loop screen:address:screen, console:address:console, 2:address:programming-environment-data ] # implicitly scroll up to first sandbox screen-should-contain [ @@ -284,9 +284,9 @@ scenario deleting-updates-sandbox-count [ trace-until 100/app # trace too long assume-screen 30/width, 10/height # initialize environment - 1:address:shared:array:character <- new [] - 2:address:shared:programming-environment-data <- new-programming-environment screen:address:shared:screen, 1:address:shared:array:character - render-all screen, 2:address:shared:programming-environment-data + 1:address:array:character <- new [] + 2:address:programming-environment-data <- new-programming-environment screen:address:screen, 1:address:array:character + render-all screen, 2:address:programming-environment-data # create 2 sandboxes assume-console [ press ctrl-n @@ -295,7 +295,7 @@ scenario deleting-updates-sandbox-count [ type [add 1, 1] press F4 ] - event-loop screen:address:shared:screen, console:address:shared:console, 2:address:shared:programming-environment-data + event-loop screen:address:screen, console:address:console, 2:address:programming-environment-data screen-should-contain [ . . . . @@ -315,7 +315,7 @@ scenario deleting-updates-sandbox-count [ press down-arrow ] run [ - event-loop screen:address:shared:screen, console:address:shared:console, 2:address:shared:programming-environment-data + event-loop screen:address:screen, console:address:console, 2:address:programming-environment-data ] # shouldn't go past last sandbox screen-should-contain [ |