From 42f08f13b2fbbaab65783124553ac3022af8fa02 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Wed, 11 Jan 2017 22:44:25 -0800 Subject: 3734 --- exuberant_ctags_rc | 1 + html/edit/001-editor.mu.html | 2 +- html/edit/004-programming-environment.mu.html | 6 +++--- html/edit/005-sandbox.mu.html | 10 +++++----- html/edit/006-sandbox-copy.mu.html | 2 +- html/edit/007-sandbox-delete.mu.html | 2 +- html/edit/008-sandbox-edit.mu.html | 2 +- html/edit/009-sandbox-test.mu.html | 2 +- html/edit/010-sandbox-trace.mu.html | 2 +- html/edit/011-errors.mu.html | 2 +- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/exuberant_ctags_rc b/exuberant_ctags_rc index 25d3780c..b3057d9a 100644 --- a/exuberant_ctags_rc +++ b/exuberant_ctags_rc @@ -6,4 +6,5 @@ --regex-mu=/^recipe![ \t]+([^ \t]*)/\1/d,definition/ --regex-mu=/^container[ \t]+([^ \t]*)/\1/s,struct/ --regex-mu=/^exclusive-container[ \t]+([^ \t]*)/\1/u,union/ +--regex-mu=/$x/x/x/e/ --------- next option is for way-points in Mu --regex-mu=/^[ \t]*(<[^ \t]*>)/\1/d,definition/ diff --git a/html/edit/001-editor.mu.html b/html/edit/001-editor.mu.html index 55cb3a73..fc380b8d 100644 --- a/html/edit/001-editor.mu.html +++ b/html/edit/001-editor.mu.html @@ -63,7 +63,7 @@ if ('onhashchange' in window) { 2 3 # temporary main for this layer: just render the given text at the given 4 # screen dimensions, then stop - 5 def! main text:text [ + 5 def main text:text [ 6 local-scope 7 load-ingredients 8 open-console diff --git a/html/edit/004-programming-environment.mu.html b/html/edit/004-programming-environment.mu.html index e543a1f1..86601105 100644 --- a/html/edit/004-programming-environment.mu.html +++ b/html/edit/004-programming-environment.mu.html @@ -220,7 +220,7 @@ if ('onhashchange' in window) { 159 # no more events, no force render 160 { 161 break-unless render? -162 screen <- render-sandbox-side screen, env, render +162 screen <- render-sandbox-side screen, env, render 163 jump +finish-event 164 } 165 } @@ -524,7 +524,7 @@ if ('onhashchange' in window) { 463 draw-vertical screen, divider, 1/top, height, 9482/vertical-dotted 464 # 465 screen <- render-recipes screen, env, render-editor -466 screen <- render-sandbox-side screen, env, render-editor +466 screen <- render-sandbox-side screen, env, render-editor 467 <render-components-end> 468 # 469 recipes:&:editor <- get *env, recipes:offset @@ -554,7 +554,7 @@ if ('onhashchange' in window) { 493 ] 494 495 # replaced in a later layer -496 def render-sandbox-side screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [ +496 def render-sandbox-side screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [ 497 local-scope 498 load-ingredients 499 current-sandbox:&:editor <- get *env, current-sandbox:offset diff --git a/html/edit/005-sandbox.mu.html b/html/edit/005-sandbox.mu.html index 7f27f164..bd92a649 100644 --- a/html/edit/005-sandbox.mu.html +++ b/html/edit/005-sandbox.mu.html @@ -204,7 +204,7 @@ if ('onhashchange' in window) { 143 def run-sandboxes env:&:environment, resources:&:resources, screen:&:screen -> errors-found?:bool, env:&:environment, resources:&:resources, screen:&:screen [ 144 local-scope 145 load-ingredients - 146 errors-found?:bool <- update-recipes env, resources, screen + 146 errors-found?:bool <- update-recipes env, resources, screen 147 return-if errors-found? 148 # check contents of right editor (sandbox) 149 <run-sandboxes-begin> @@ -246,7 +246,7 @@ if ('onhashchange' in window) { 185 186 # load code from disk 187 # replaced in a later layer (whereupon errors-found? will actually be set) - 188 def update-recipes env:&:environment, resources:&:resources, screen:&:screen -> errors-found?:bool, env:&:environment, resources:&:resources, screen:&:screen [ + 188 def update-recipes env:&:environment, resources:&:resources, screen:&:screen -> errors-found?:bool, env:&:environment, resources:&:resources, screen:&:screen [ 189 local-scope 190 load-ingredients 191 recipes:&:editor <- get *env, recipes:offset @@ -293,7 +293,7 @@ if ('onhashchange' in window) { 232 } 233 ] 234 - 235 def! render-sandbox-side screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [ + 235 def! render-sandbox-side screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [ 236 local-scope 237 load-ingredients 238 trace 11, [app], [render sandbox side] @@ -946,7 +946,7 @@ if ('onhashchange' in window) { 885 *env <- put *env, render-from:offset, render-from 886 } 887 hide-screen screen - 888 screen <- render-sandbox-side screen, env, render + 888 screen <- render-sandbox-side screen, env, render 889 show-screen screen 890 jump +finish-event 891 } @@ -977,7 +977,7 @@ if ('onhashchange' in window) { 916 render-from <- subtract render-from, 1 917 *env <- put *env, render-from:offset, render-from 918 hide-screen screen - 919 screen <- render-sandbox-side screen, env, render + 919 screen <- render-sandbox-side screen, env, render 920 show-screen screen 921 jump +finish-event 922 } diff --git a/html/edit/006-sandbox-copy.mu.html b/html/edit/006-sandbox-copy.mu.html index 3e828969..b5c5bb85 100644 --- a/html/edit/006-sandbox-copy.mu.html +++ b/html/edit/006-sandbox-copy.mu.html @@ -189,7 +189,7 @@ if ('onhashchange' in window) { 129 copy?, env <- try-copy-sandbox click-row, env 130 break-unless copy? 131 hide-screen screen -132 screen <- render-sandbox-side screen, env, render +132 screen <- render-sandbox-side screen, env, render 133 screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env 134 show-screen screen 135 loop +next-event diff --git a/html/edit/007-sandbox-delete.mu.html b/html/edit/007-sandbox-delete.mu.html index 496d7a94..f8292598 100644 --- a/html/edit/007-sandbox-delete.mu.html +++ b/html/edit/007-sandbox-delete.mu.html @@ -133,7 +133,7 @@ if ('onhashchange' in window) { 73 delete?, env <- try-delete-sandbox click-row, env 74 break-unless delete? 75 hide-screen screen - 76 screen <- render-sandbox-side screen, env, render + 76 screen <- render-sandbox-side screen, env, render 77 screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env 78 show-screen screen 79 loop +next-event diff --git a/html/edit/008-sandbox-edit.mu.html b/html/edit/008-sandbox-edit.mu.html index a7482e8a..4ba0897a 100644 --- a/html/edit/008-sandbox-edit.mu.html +++ b/html/edit/008-sandbox-edit.mu.html @@ -172,7 +172,7 @@ if ('onhashchange' in window) { 112 edit?, env <- try-edit-sandbox click-row, env 113 break-unless edit? 114 hide-screen screen -115 screen <- render-sandbox-side screen, env, render +115 screen <- render-sandbox-side screen, env, render 116 screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env 117 show-screen screen 118 loop +next-event diff --git a/html/edit/009-sandbox-test.mu.html b/html/edit/009-sandbox-test.mu.html index 7a0f1a16..578ffb9f 100644 --- a/html/edit/009-sandbox-test.mu.html +++ b/html/edit/009-sandbox-test.mu.html @@ -192,7 +192,7 @@ if ('onhashchange' in window) { 131 sandbox <- toggle-expected-response sandbox 132 save-sandboxes env, resources 133 hide-screen screen -134 screen <- render-sandbox-side screen, env, render +134 screen <- render-sandbox-side screen, env, render 135 screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env 136 # no change in cursor 137 show-screen screen diff --git a/html/edit/010-sandbox-trace.mu.html b/html/edit/010-sandbox-trace.mu.html index 472a7698..caafdea5 100644 --- a/html/edit/010-sandbox-trace.mu.html +++ b/html/edit/010-sandbox-trace.mu.html @@ -262,7 +262,7 @@ if ('onhashchange' in window) { 201 x <- not x 202 *sandbox <- put *sandbox, display-trace?:offset, x 203 hide-screen screen -204 screen <- render-sandbox-side screen, env, render +204 screen <- render-sandbox-side screen, env, render 205 screen <- update-cursor screen, recipes, current-sandbox, sandbox-in-focus?, env 206 # no change in cursor 207 show-screen screen diff --git a/html/edit/011-errors.mu.html b/html/edit/011-errors.mu.html index 1bd96e45..c30f72a8 100644 --- a/html/edit/011-errors.mu.html +++ b/html/edit/011-errors.mu.html @@ -66,7 +66,7 @@ if ('onhashchange' in window) { 5 ] 6 7 # copy code from recipe editor, persist to disk, load, save any errors - 8 def! update-recipes env:&:environment, resources:&:resources, screen:&:screen -> errors-found?:bool, env:&:environment, resources:&:resources, screen:&:screen [ + 8 def! update-recipes env:&:environment, resources:&:resources, screen:&:screen -> errors-found?:bool, env:&:environment, resources:&:resources, screen:&:screen [ 9 local-scope 10 load-ingredients 11 recipes:&:editor <- get *env, recipes:offset -- cgit 1.4.1-2-gfad0