diff options
Diffstat (limited to 'edit')
| -rw-r--r-- | edit/001-editor.mu | 4 | ||||
| -rw-r--r-- | edit/002-typing.mu | 18 | ||||
| -rw-r--r-- | edit/004-programming-environment.mu | 4 | ||||
| -rw-r--r-- | edit/005-sandbox.mu | 10 |
4 files changed, 18 insertions, 18 deletions
diff --git a/edit/001-editor.mu b/edit/001-editor.mu index f7b7fb89..d4e0a479 100644 --- a/edit/001-editor.mu +++ b/edit/001-editor.mu @@ -207,7 +207,7 @@ def render screen:&:screen, editor:&:editor -> last-row:num, last-column:num, sc def clear-screen-from screen:&:screen, row:num, column:num, left:num, right:num -> screen:&:screen [ local-scope load-ingredients - stash [clear-screen-from] row column [between] left [and] right +#? stash [clear-screen-from] row column [between] left [and] right # if it's the real screen, use the optimized primitive { break-if screen @@ -218,7 +218,7 @@ def clear-screen-from screen:&:screen, row:num, column:num, left:num, right:num screen <- move-cursor screen, row, column clear-line-until screen, right clear-rest-of-screen screen, row, left, right - screen <- move-cursor screen, row, column +#? screen <- move-cursor screen, row, column ] def clear-rest-of-screen screen:&:screen, row:num, left:num, right:num -> screen:&:screen [ diff --git a/edit/002-typing.mu b/edit/002-typing.mu index 05ace7c5..acb0a53c 100644 --- a/edit/002-typing.mu +++ b/edit/002-typing.mu @@ -1116,11 +1116,11 @@ after <handle-special-key> [ def draw-horizontal screen:&:screen, row:num, x:num, right:num -> screen:&:screen [ local-scope load-ingredients - a:num, b:num <- cursor-position screen - stash [draw-horizontal] row [--] a b +#? a:num, b:num <- cursor-position screen +#? stash [draw-horizontal] row [--] a b height:num <- screen-height screen past-bottom?:bool <- greater-or-equal row, height - stash [ past-bottom?] past-bottom? +#? stash [ past-bottom?] past-bottom? return-if past-bottom? style:char, style-found?:bool <- next-ingredient { @@ -1138,18 +1138,18 @@ def draw-horizontal screen:&:screen, row:num, x:num, right:num -> screen:&:scree break-if bg-color-found? bg-color <- copy 0/black } - stash [aa] x +#? stash [aa] x screen <- move-cursor screen, row, x { continue?:bool <- lesser-or-equal x, right # right is inclusive, to match editor semantics break-unless continue? - a b <- cursor-position screen - stash [bb] x [--] a b +#? a b <- cursor-position screen +#? stash [bb] x [--] a b print screen, style, color, bg-color - a b <- cursor-position screen - stash [cc] x [--] a b +#? a b <- cursor-position screen +#? stash [cc] x [--] a b x <- add x, 1 loop } - stash [draw-horizontal done] +#? stash [draw-horizontal done] ] diff --git a/edit/004-programming-environment.mu b/edit/004-programming-environment.mu index bcd3b524..021d9d73 100644 --- a/edit/004-programming-environment.mu +++ b/edit/004-programming-environment.mu @@ -447,7 +447,7 @@ def render-recipes screen:&:screen, env:&:environment, render-editor:render-reci clear-screen-from screen, row, left, left, right # assert-no-scroll screen, old-top-idx - stash [render recipes done] +#? stash [render recipes done] ] # replaced in a later layer @@ -468,7 +468,7 @@ def render-sandbox-side screen:&:screen, env:&:environment, render-editor:render clear-screen-from screen, row, left, left, right # assert-no-scroll screen, old-top-idx - stash [render sandbox side0 done] +#? stash [render sandbox side0 done] ] def update-cursor screen:&:screen, recipes:&:editor, current-sandbox:&:editor, sandbox-in-focus?:bool, env:&:environment -> screen:&:screen [ diff --git a/edit/005-sandbox.mu b/edit/005-sandbox.mu index 2b17ecc2..f27c1a2c 100644 --- a/edit/005-sandbox.mu +++ b/edit/005-sandbox.mu @@ -270,15 +270,15 @@ def! render-sandbox-side screen:&:screen, env:&:environment, render-editor:rende clear-rest-of-screen screen, row, left, right # assert-no-scroll screen, old-top-idx - stash [render sandbox side done] +#? stash [render sandbox side done] ] def render-sandboxes screen:&:screen, sandbox:&:sandbox, left:num, right:num, row:num, render-from:num, idx:num -> row:num, screen:&:screen, sandbox:&:sandbox [ local-scope load-ingredients return-unless sandbox - a:num b:num <- cursor-position screen - stash [render-sandboxes] idx [:] row [--] a b +#? a:num b:num <- cursor-position screen +#? stash [render-sandboxes] idx [:] row [--] a b screen-height:num <- screen-height screen at-bottom?:bool <- greater-or-equal row, screen-height return-if at-bottom? @@ -361,11 +361,11 @@ scenario skip-rendering-sandbox-menu-past-bottom-row [ # create two sandboxes such that the top one just barely fills the screen env:&:environment <- new-programming-environment resources, screen, [] env <- restore-sandboxes env, resources - $clear-trace +#? $clear-trace run [ render-all screen, env, render ] - $dump-trace [app] +#? $dump-trace [app] screen-should-contain [ . run (F4) . . ┊ . |