diff options
Diffstat (limited to 'edit')
| -rw-r--r-- | edit/001-editor.mu | 6 | ||||
| -rw-r--r-- | edit/002-typing.mu | 6 | ||||
| -rw-r--r-- | edit/003-shortcuts.mu | 8 | ||||
| -rw-r--r-- | edit/004-programming-environment.mu | 22 | ||||
| -rw-r--r-- | edit/005-sandbox.mu | 14 | ||||
| -rw-r--r-- | edit/008-sandbox-test.mu | 2 | ||||
| -rw-r--r-- | edit/009-sandbox-trace.mu | 4 |
7 files changed, 31 insertions, 31 deletions
diff --git a/edit/001-editor.mu b/edit/001-editor.mu index f84e388a..56c98d81 100644 --- a/edit/001-editor.mu +++ b/edit/001-editor.mu @@ -193,14 +193,14 @@ recipe render screen:address:screen, editor:address:editor-data -> last-row:numb at-right?:boolean <- equal column, right break-unless at-right? # print wrap icon - print-character screen, 8617/loop-back-to-left, 245/grey + print screen, 8617/loop-back-to-left, 245/grey column <- copy left row <- add row, 1 screen <- move-cursor screen, row, column # don't increment curr loop +next-character:label } - print-character screen, c, color + print screen, c, color curr <- next curr prev <- next prev column <- add column, 1 @@ -230,7 +230,7 @@ recipe clear-line-delimited screen:address:screen, column:number, right:number - { done?:boolean <- greater-than column, right break-if done? - screen <- print-character screen, 32/space + screen <- print screen, 32/space column <- add column, 1 loop } diff --git a/edit/002-typing.mu b/edit/002-typing.mu index bc47e2d8..2b446101 100644 --- a/edit/002-typing.mu +++ b/edit/002-typing.mu @@ -224,7 +224,7 @@ recipe insert-at-cursor editor:address:editor-data, c:character, screen:address: overflow?:boolean <- and at-bottom?, at-right? break-if overflow? move-cursor screen, save-row, save-column - print-character screen, c + print screen, c go-render? <- copy 0/false reply } @@ -246,7 +246,7 @@ recipe insert-at-cursor editor:address:editor-data, c:character, screen:address: currc:character <- get *curr, value:offset at-newline?:boolean <- equal currc, 10/newline break-if at-newline? - print-character screen, currc + print screen, currc curr-column <- add curr-column, 1 curr <- next curr loop @@ -1035,7 +1035,7 @@ recipe draw-horizontal screen:address:screen, row:number, x:number, right:number { continue?:boolean <- lesser-or-equal x, right # right is inclusive, to match editor-data semantics break-unless continue? - print-character screen, style, color, bg-color + print screen, style, color, bg-color x <- add x, 1 loop } diff --git a/edit/003-shortcuts.mu b/edit/003-shortcuts.mu index 9c46c927..b3676efb 100644 --- a/edit/003-shortcuts.mu +++ b/edit/003-shortcuts.mu @@ -118,13 +118,13 @@ recipe delete-before-cursor editor:address:editor-data, screen:address:screen -> currc:character <- get *curr, value:offset at-newline?:boolean <- equal currc, 10/newline break-if at-newline? - screen <- print-character screen, currc + screen <- print screen, currc curr-column <- add curr-column, 1 curr <- next curr loop } # we're guaranteed not to be at the right margin - screen <- print-character screen, 32/space + screen <- print screen, 32/space go-render? <- copy 0/false ] @@ -358,13 +358,13 @@ recipe delete-at-cursor editor:address:editor-data, screen:address:screen -> edi currc:character <- get *curr, value:offset at-newline?:boolean <- equal currc, 10/newline break-if at-newline? - screen <- print-character screen, currc + screen <- print screen, currc curr-column <- add curr-column, 1 curr <- next curr loop } # we're guaranteed not to be at the right margin - screen <- print-character screen, 32/space + screen <- print screen, 32/space go-render? <- copy 0/false ] diff --git a/edit/004-programming-environment.mu b/edit/004-programming-environment.mu index 51dd2362..b4d9f442 100644 --- a/edit/004-programming-environment.mu +++ b/edit/004-programming-environment.mu @@ -267,7 +267,7 @@ scenario edit-multiple-editors [ ] # show the cursor at the right window run [ - print-character screen:address:screen, 9251/␣/cursor + print screen:address:screen, 9251/␣/cursor ] screen-should-contain [ . run (F4) . @@ -307,7 +307,7 @@ scenario editor-in-focus-keeps-cursor [ assume-console [] run [ event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data - print-character screen:address:screen, 9251/␣/cursor + print screen:address:screen, 9251/␣/cursor ] # is cursor at the right place? screen-should-contain [ @@ -322,7 +322,7 @@ scenario editor-in-focus-keeps-cursor [ ] run [ event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data - print-character screen:address:screen, 9251/␣/cursor + print screen:address:screen, 9251/␣/cursor ] # cursor should still be right screen-should-contain [ @@ -356,7 +356,7 @@ def] ] run [ event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data - print-character screen:address:screen, 9251/␣/cursor + print screen:address:screen, 9251/␣/cursor ] # cursor moves to end of old line screen-should-contain [ @@ -473,7 +473,7 @@ recipe render screen:address:screen, s:address:array:character, left:number, rig at-right?:boolean <- equal column, right break-unless at-right? # print wrap icon - print-character screen, 8617/loop-back-to-left, 245/grey + print screen, 8617/loop-back-to-left, 245/grey column <- copy left row <- add row, 1 screen <- move-cursor screen, row, column @@ -488,7 +488,7 @@ recipe render screen:address:screen, s:address:array:character, left:number, rig { done?:boolean <- greater-than column, right break-if done? - print-character screen, 32/space + print screen, 32/space column <- add column, 1 loop } @@ -497,7 +497,7 @@ recipe render screen:address:screen, s:address:array:character, left:number, rig screen <- move-cursor screen, row, column loop +next-character:label } - print-character screen, c, color + print screen, c, color column <- add column, 1 loop } @@ -534,7 +534,7 @@ recipe render-code screen:address:screen, s:address:array:character, left:number at-right?:boolean <- equal column, right break-unless at-right? # print wrap icon - print-character screen, 8617/loop-back-to-left, 245/grey + print screen, 8617/loop-back-to-left, 245/grey column <- copy left row <- add row, 1 screen <- move-cursor screen, row, column @@ -549,7 +549,7 @@ recipe render-code screen:address:screen, s:address:array:character, left:number { done?:boolean <- greater-than column, right break-if done? - print-character screen, 32/space + print screen, 32/space column <- add column, 1 loop } @@ -558,7 +558,7 @@ recipe render-code screen:address:screen, s:address:array:character, left:number screen <- move-cursor screen, row, column loop +next-character:label } - print-character screen, c, color + print screen, c, color column <- add column, 1 loop } @@ -616,7 +616,7 @@ recipe draw-vertical screen:address:screen, col:number, y:number, bottom:number continue?:boolean <- lesser-than y, bottom break-unless continue? screen <- move-cursor screen, y, col - print-character screen, style, color + print screen, style, color y <- add y, 1 loop } diff --git a/edit/005-sandbox.mu b/edit/005-sandbox.mu index bb34de1b..b44f127f 100644 --- a/edit/005-sandbox.mu +++ b/edit/005-sandbox.mu @@ -250,7 +250,7 @@ recipe render-sandboxes screen:address:screen, sandbox:address:sandbox-data, lef row <- add row, 1 screen <- move-cursor screen, row, left clear-line-delimited screen, left, right - print-character screen, 120/x, 245/grey + print screen, 120/x, 245/grey # save menu row so we can detect clicks to it later starting-row:address:number <- get-address *sandbox, starting-row-on-screen:offset *starting-row <- copy row @@ -346,9 +346,9 @@ recipe render-screen screen:address:screen, sandbox-screen:address:screen, left: column <- copy left screen <- move-cursor screen, row, column # initial leader for each row: two spaces and a '.' - print-character screen, 32/space, 245/grey - print-character screen, 32/space, 245/grey - print-character screen, 46/full-stop, 245/grey + print screen, 32/space, 245/grey + print screen, 32/space, 245/grey + print screen, 46/full-stop, 245/grey column <- add left, 3 { # print row @@ -363,19 +363,19 @@ recipe render-screen screen:address:screen, sandbox-screen:address:screen, left: break-unless white? color <- copy 245/grey } - print-character screen, c, color + print screen, c, color column <- add column, 1 i <- add i, 1 loop } # print final '.' - print-character screen, 46/full-stop, 245/grey + print screen, 46/full-stop, 245/grey column <- add column, 1 { # clear rest of current line line-done?:boolean <- greater-than column, right break-if line-done? - print-character screen, 32/space + print screen, 32/space column <- add column, 1 loop } diff --git a/edit/008-sandbox-test.mu b/edit/008-sandbox-test.mu index 6c3c4acd..524000f2 100644 --- a/edit/008-sandbox-test.mu +++ b/edit/008-sandbox-test.mu @@ -45,7 +45,7 @@ recipe foo [ ] # cursor should remain unmoved run [ - print-character screen:address:screen, 9251/␣/cursor + print screen:address:screen, 9251/␣/cursor ] screen-should-contain [ . run (F4) . diff --git a/edit/009-sandbox-trace.mu b/edit/009-sandbox-trace.mu index 10e34c9c..f3e78701 100644 --- a/edit/009-sandbox-trace.mu +++ b/edit/009-sandbox-trace.mu @@ -30,7 +30,7 @@ recipe foo [ ] run [ event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data - print-character screen:address:screen, 9251/␣/cursor + print screen:address:screen, 9251/␣/cursor ] # trace now printed and cursor shouldn't have budged screen-should-contain [ @@ -59,7 +59,7 @@ recipe foo [ ] run [ event-loop screen:address:screen, console:address:console, 3:address:programming-environment-data - print-character screen:address:screen, 9251/␣/cursor + print screen:address:screen, 9251/␣/cursor ] # trace hidden again screen-should-contain [ |