3921

5 files changed, 12 insertions, 7 deletions

diff --git a/edit/004-programming-environment.mu b/edit/004-programming-environment.mu
index 71e72e46..c1f8af7f 100644
--- a/edit/004-programming-environment.mu
+++ b/edit/004-programming-environment.mu
@@ -397,7 +397,9 @@ def]
   ]
 ]
 
-def render-all screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [
+type render-recipe = (recipe (address screen) (address editor) -> number number (address screen) (address editor))
+
+def render-all screen:&:screen, env:&:environment, render-editor:render-recipe -> screen:&:screen, env:&:environment [
   local-scope
   load-ingredients
   trace 10, [app], [render all]
@@ -429,7 +431,7 @@ def render-all screen:&:screen, env:&:environment, {render-editor: (recipe (addr
   assert-no-scroll screen, old-top-idx
 ]
 
-def render-recipes screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [
+def render-recipes screen:&:screen, env:&:environment, render-editor:render-recipe -> screen:&:screen, env:&:environment [
   local-scope
   load-ingredients
   trace 11, [app], [render recipes]
@@ -448,7 +450,7 @@ def render-recipes screen:&:screen, env:&:environment, {render-editor: (recipe (
 ]
 
 # replaced in a later layer
-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 [
+def render-sandbox-side screen:&:screen, env:&:environment, render-editor:render-recipe -> screen:&:screen, env:&:environment [
   local-scope
   load-ingredients
   trace 11, [app], [render sandboxes]
diff --git a/edit/005-sandbox.mu b/edit/005-sandbox.mu
index caa3e6e6..e58b6d47 100644
--- a/edit/005-sandbox.mu
+++ b/edit/005-sandbox.mu
@@ -243,7 +243,7 @@ def save-sandboxes env:&:environment, resources:&:resources -> resources:&:resou
   }
 ]
 
-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 [
+def! render-sandbox-side screen:&:screen, env:&:environment, render-editor:render-recipe -> screen:&:screen, env:&:environment [
   local-scope
   load-ingredients
   trace 11, [app], [render sandbox side]
diff --git a/exuberant_ctags_rc b/exuberant_ctags_rc
index e8a6828a..46823a2e 100644
--- a/exuberant_ctags_rc
+++ b/exuberant_ctags_rc
@@ -4,6 +4,7 @@
 --regex-mu=/^def![ \t]+([^ \t]*)/\1/d,definition/
 --regex-mu=/^recipe[ \t]+([^ \t]*)/\1/d,definition/
 --regex-mu=/^recipe![ \t]+([^ \t]*)/\1/d,definition/
+--regex-mu=/^type[ \t]+([^ \t]*)/\1/t,typeref/
 --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
diff --git a/sandbox/004-programming-environment.mu b/sandbox/004-programming-environment.mu
index ab91cdaf..8204f296 100644
--- a/sandbox/004-programming-environment.mu
+++ b/sandbox/004-programming-environment.mu
@@ -191,7 +191,9 @@ def render-without-moving-cursor screen:&:screen, editor:&:editor -> last-row:nu
   return row, column
 ]
 
-def render-all screen:&:screen, env:&:environment, {render-editor: (recipe (address screen) (address editor) -> number number (address screen) (address editor))} -> screen:&:screen, env:&:environment [
+type render-recipe = (recipe (address screen) (address editor) -> number number (address screen) (address editor))
+
+def render-all screen:&:screen, env:&:environment, render-editor:render-recipe -> screen:&:screen, env:&:environment [
   local-scope
   load-ingredients
   trace 10, [app], [render all]
@@ -216,7 +218,7 @@ def render-all screen:&:screen, env:&:environment, {render-editor: (recipe (addr
 ]
 
 # replaced in a later layer
-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 [
+def render-sandbox-side screen:&:screen, env:&:environment, render-editor:render-recipe -> screen:&:screen, env:&:environment [
   local-scope
   load-ingredients
   current-sandbox:&:editor <- get *env, current-sandbox:offset
diff --git a/sandbox/005-sandbox.mu b/sandbox/005-sandbox.mu
index 3375a60f..c1495920 100644
--- a/sandbox/005-sandbox.mu
+++ b/sandbox/005-sandbox.mu
@@ -227,7 +227,7 @@ def save-sandboxes env:&:environment, resources:&:resources -> resources:&:resou
   }
 ]
 
-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 [
+def! render-sandbox-side screen:&:screen, env:&:environment, render-editor:render-recipe -> screen:&:screen, env:&:environment [
   local-scope
   load-ingredients
   trace 11, [app], [render sandbox side]