From 3d8b137c879c6f5c01588c2dbbb35bc0ec028909 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 17 Sep 2016 13:25:40 -0700 Subject: 3391 - type abbreviations everywhere Well, almost. I can't use them in some places in C++ where I'm just creating a temporary reagent without passing it through transforms. Like in some unit tests. I can't use them in memory-should-contain. And there's one remaining bug: I can't use abbreviations in a couple of places in 075channel.mu. --- sandbox/009-sandbox-test.mu | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'sandbox/009-sandbox-test.mu') diff --git a/sandbox/009-sandbox-test.mu b/sandbox/009-sandbox-test.mu index a0da09a8..7a2c5772 100644 --- a/sandbox/009-sandbox-test.mu +++ b/sandbox/009-sandbox-test.mu @@ -13,8 +13,8 @@ def foo [ assume-console [ press F4 ] - 3:address:programming-environment-data <- new-programming-environment screen:address:screen, 2:text - event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data, 1:text/test-recipes + 3:&:programming-environment-data <- new-programming-environment screen:&:screen, 2:text + event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data, 1:text/test-recipes screen-should-contain [ . run (F4) . . . @@ -30,7 +30,7 @@ def foo [ left-click 5, 21 ] run [ - event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data, 1:text/test-recipes + event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data, 1:text/test-recipes ] # color toggles to green screen-should-contain-in-color 2/green, [ @@ -44,8 +44,8 @@ def foo [ ] # cursor should remain unmoved run [ - 4:character/cursor <- copy 9251/␣ - print screen:address:screen, 4:character/cursor + 4:char/cursor <- copy 9251/␣ + print screen:&:screen, 4:char/cursor ] screen-should-contain [ . run (F4) . @@ -67,7 +67,7 @@ def foo [ press F4 ] run [ - event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data, 1:text/new-test-recipes + event-loop screen:&:screen, console:&:console, 3:&:programming-environment-data, 1:text/new-test-recipes ] # result turns red screen-should-contain-in-color 1/red, [ @@ -83,7 +83,7 @@ def foo [ # this requires tracking a couple more things container sandbox-data [ - response-starting-row-on-screen:number + response-starting-row-on-screen:num expected-response:text ] @@ -110,18 +110,18 @@ before [ after [ # check if it's inside the output of any sandbox { - sandbox-left-margin:number <- get *current-sandbox, left:offset - click-column:number <- get t, column:offset - on-sandbox-side?:boolean <- greater-or-equal click-column, sandbox-left-margin + sandbox-left-margin:num <- get *current-sandbox, left:offset + 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:address:sandbox-data <- get *env, sandbox:offset + first-sandbox:&: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 + 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 output is being clicked on - sandbox:address:sandbox-data <- find-click-in-sandbox-output env, click-row + sandbox:&: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 @@ -135,33 +135,33 @@ after [ } ] -def find-click-in-sandbox-output env:address:programming-environment-data, click-row:number -> sandbox:address:sandbox-data [ +def find-click-in-sandbox-output env:&:programming-environment-data, click-row:num -> sandbox:&:sandbox-data [ local-scope load-ingredients # assert click-row >= sandbox.starting-row-on-screen - 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 + sandbox:&:sandbox-data <- get *env, sandbox:offset + start:num <- get *sandbox, starting-row-on-screen:offset + clicked-on-sandboxes?:bool <- 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:sandbox-data <- get *sandbox, next-sandbox:offset + next-sandbox:&: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 + next-start:num <- get *next-sandbox, starting-row-on-screen:offset + found?:bool <- lesser-than click-row, next-start break-if found? sandbox <- copy next-sandbox loop } # return sandbox if click is in its output region - response-starting-row:number <- get *sandbox, response-starting-row-on-screen:offset + response-starting-row:num <- get *sandbox, response-starting-row-on-screen:offset return-unless response-starting-row, 0/no-click-in-sandbox-output - click-in-response?:boolean <- greater-or-equal click-row, response-starting-row + click-in-response?:bool <- greater-or-equal click-row, response-starting-row return-unless click-in-response?, 0/no-click-in-sandbox-output return sandbox ] -def toggle-expected-response sandbox:address:sandbox-data -> sandbox:address:sandbox-data [ +def toggle-expected-response sandbox:&:sandbox-data -> sandbox:&:sandbox-data [ local-scope load-ingredients expected-response:text <- get *sandbox, expected-response:offset @@ -185,13 +185,13 @@ after [ *sandbox <- put *sandbox, response-starting-row-on-screen:offset, row expected-response:text <- get *sandbox, expected-response:offset break-unless expected-response # fall-through to print in grey - response-is-expected?:boolean <- equal expected-response, sandbox-response + response-is-expected?:bool <- equal expected-response, sandbox-response { - break-if response-is-expected?:boolean + break-if response-is-expected?:bool row, screen <- render-text screen, sandbox-response, left, right, 1/red, row } { - break-unless response-is-expected?:boolean + break-unless response-is-expected?:bool row, screen <- render-text screen, sandbox-response, left, right, 2/green, row } jump +render-sandbox-end:label -- cgit 1.4.1-2-gfad0