3700

Reorder products of some functions in the edit/ and sandbox/ apps. My
recent realization: always return 'real' products before ones that just
indicate an ingredient is mutable.

4 files changed, 51 insertions, 89 deletions

diff --git a/sandbox/002-typing.mu b/sandbox/002-typing.mu
index a584e6a3..4f704f0d 100644
--- a/sandbox/002-typing.mu
+++ b/sandbox/002-typing.mu
@@ -34,7 +34,7 @@ def editor-event-loop screen:&:screen, console:&:console, editor:&:editor -> scr
     # keyboard events
     {
       break-if is-touch?
-      screen, editor, go-render?:bool <- handle-keyboard-event screen, editor, e
+      go-render?:bool <- handle-keyboard-event screen, editor, e
       {
         break-unless go-render?
         screen <- editor-render screen, editor
@@ -161,11 +161,10 @@ def snap-cursor screen:&:screen, editor:&:editor, target-row:num, target-column:
 
 # Process an event 'e' and try to minimally update the screen.
 # Set 'go-render?' to true to indicate the caller must perform a non-minimal update.
-def handle-keyboard-event screen:&:screen, editor:&:editor, e:event -> screen:&:screen, editor:&:editor, go-render?:bool [
+def handle-keyboard-event screen:&:screen, editor:&:editor, e:event -> go-render?:bool, screen:&:screen, editor:&:editor [
   local-scope
   load-ingredients
-  go-render? <- copy 0/false
-  return-unless editor
+  return-unless editor, 0/don't-render
   screen-width:num <- screen-width screen
   screen-height:num <- screen-height screen
   left:num <- get *editor, left:offset
@@ -184,11 +183,10 @@ def handle-keyboard-event screen:&:screen, editor:&:editor, e:event -> screen:&:
     <handle-special-character>
     # ignore any other special characters
     regular-character?:bool <- greater-or-equal c, 32/space
-    go-render? <- copy 0/false
-    return-unless regular-character?
+    return-unless regular-character?, 0/don't-render
     # otherwise type it in
     <insert-character-begin>
-    editor, screen, go-render?:bool <- insert-at-cursor editor, c, screen
+    go-render? <- insert-at-cursor editor, c, screen
     <insert-character-end>
     return
   }
@@ -197,11 +195,10 @@ def handle-keyboard-event screen:&:screen, editor:&:editor, e:event -> screen:&:
   assert is-keycode?, [event was of unknown type; neither keyboard nor mouse]
   # handlers for each special key will go here
   <handle-special-key>
-  go-render? <- copy 1/true
-  return
+  return 1/go-render
 ]
 
-def insert-at-cursor editor:&:editor, c:char, screen:&:screen -> editor:&:editor, screen:&:screen, go-render?:bool [
+def insert-at-cursor editor:&:editor, c:char, screen:&:screen -> go-render?:bool, editor:&:editor, screen:&:screen [
   local-scope
   load-ingredients
   before-cursor:&:duplex-list:char <- get *editor, before-cursor:offset
@@ -233,8 +230,7 @@ def insert-at-cursor editor:&:editor, c:char, screen:&:screen -> editor:&:editor
     break-if overflow?
     move-cursor screen, save-row, save-column
     print screen, c
-    go-render? <- copy 0/false
-    return
+    return 0/don't-render
   }
   {
     # not at right margin? print the character and rest of line
@@ -246,9 +242,8 @@ def insert-at-cursor editor:&:editor, c:char, screen:&:screen -> editor:&:editor
     curr-column:num <- copy save-column
     {
       # hit right margin? give up and let caller render
-      go-render? <- copy 1/true
       at-right?:bool <- greater-than curr-column, right
-      return-if at-right?
+      return-if at-right?, 1/go-render
       break-unless curr
       # newline? done.
       currc:char <- get *curr, value:offset
@@ -259,11 +254,9 @@ def insert-at-cursor editor:&:editor, c:char, screen:&:screen -> editor:&:editor
       curr <- next curr
       loop
     }
-    go-render? <- copy 0/false
-    return
+    return 0/don't-render
   }
-  go-render? <- copy 1/true
-  return
+  return 1/go-render
 ]
 
 # helper for tests
@@ -740,8 +733,7 @@ after <insert-character-special-case> [
       break-unless below-screen?
       <scroll-down>
     }
-    go-render? <- copy 1/true
-    return
+    return 1/go-render
   }
 ]
 
@@ -863,14 +855,13 @@ after <handle-special-character> [
     newline?:bool <- equal c, 10/newline
     break-unless newline?
     <insert-enter-begin>
-    editor <- insert-new-line-and-indent editor, screen
+    insert-new-line-and-indent editor, screen
     <insert-enter-end>
-    go-render? <- copy 1/true
-    return
+    return 1/go-render
   }
 ]
 
-def insert-new-line-and-indent editor:&:editor, screen:&:screen -> editor:&:editor, screen:&:screen, go-render?:bool [
+def insert-new-line-and-indent editor:&:editor, screen:&:screen -> editor:&:editor, screen:&:screen [
   local-scope
   load-ingredients
   cursor-row:num <- get *editor, cursor-row:offset
@@ -892,7 +883,6 @@ def insert-new-line-and-indent editor:&:editor, screen:&:screen -> editor:&:edit
     below-screen?:bool <- greater-or-equal cursor-row, screen-height  # must be equal, never greater
     break-unless below-screen?
     <scroll-down>
-    go-render? <- copy 1/true
     cursor-row <- subtract cursor-row, 1  # bring back into screen range
     *editor <- put *editor, cursor-row:offset, cursor-row
   }
@@ -906,7 +896,7 @@ def insert-new-line-and-indent editor:&:editor, screen:&:screen -> editor:&:edit
   {
     indent-done?:bool <- greater-or-equal i, indent
     break-if indent-done?
-    editor, screen, go-render?:bool <- insert-at-cursor editor, 32/space, screen
+    insert-at-cursor editor, 32/space, screen
     i <- add i, 1
     loop
   }
@@ -1048,8 +1038,7 @@ after <handle-special-key> [
     paste-start?:bool <- equal k, 65507/paste-start
     break-unless paste-start?
     *editor <- put *editor, indent?:offset, 0/false
-    go-render? <- copy 1/true
-    return
+    return 1/go-render
   }
 ]
 
@@ -1058,8 +1047,7 @@ after <handle-special-key> [
     paste-end?:bool <- equal k, 65506/paste-end
     break-unless paste-end?
     *editor <- put *editor, indent?:offset, 1/true
-    go-render? <- copy 1/true
-    return
+    return 1/go-render
   }
 ]
 
diff --git a/sandbox/003-shortcuts.mu b/sandbox/003-shortcuts.mu
index d4255704..4ea2b8cd 100644
--- a/sandbox/003-shortcuts.mu
+++ b/sandbox/003-shortcuts.mu
@@ -29,11 +29,10 @@ after <handle-special-character> [
     tab?:bool <- equal c, 9/tab
     break-unless tab?
     <insert-character-begin>
-    editor, screen, go-render?:bool <- insert-at-cursor editor, 32/space, screen
-    editor, screen, go-render?:bool <- insert-at-cursor editor, 32/space, screen
+    insert-at-cursor editor, 32/space, screen
+    insert-at-cursor editor, 32/space, screen
     <insert-character-end>
-    go-render? <- copy 1/true
-    return
+    return 1/go-render
   }
 ]
 
@@ -72,7 +71,7 @@ after <handle-special-character> [
     delete-previous-character?:bool <- equal c, 8/backspace
     break-unless delete-previous-character?
     <backspace-character-begin>
-    editor, screen, go-render?:bool, backspaced-cell:&:duplex-list:char <- delete-before-cursor editor, screen
+    go-render?:bool, backspaced-cell:&:duplex-list:char <- delete-before-cursor editor, screen
     <backspace-character-end>
     return
   }
@@ -81,19 +80,17 @@ after <handle-special-character> [
 # return values:
 #   go-render? - whether caller needs to update the screen
 #   backspaced-cell - value deleted (or 0 if nothing was deleted) so we can save it for undo, etc.
-def delete-before-cursor editor:&:editor, screen:&:screen -> editor:&:editor, screen:&:screen, go-render?:bool, backspaced-cell:&:duplex-list:char [
+def delete-before-cursor editor:&:editor, screen:&:screen -> go-render?:bool, backspaced-cell:&:duplex-list:char, editor:&:editor, screen:&:screen [
   local-scope
   load-ingredients
   before-cursor:&:duplex-list:char <- get *editor, before-cursor:offset
   data:&:duplex-list:char <- get *editor, data:offset
   # if at start of text (before-cursor at § sentinel), return
   prev:&:duplex-list:char <- prev before-cursor
-  go-render?, backspaced-cell <- copy 0/no-more-render, 0/nothing-deleted
-  return-unless prev
-  go-render? <- copy 1/true
+  return-unless prev, 0/no-more-render, 0/nothing-deleted
   trace 10, [app], [delete-before-cursor]
   original-row:num <- get *editor, cursor-row:offset
-  editor <- move-cursor-coordinates-left editor
+  move-cursor-coordinates-left editor
   backspaced-cell:&:duplex-list:char <- copy before-cursor
   data <- remove before-cursor, data  # will also neatly trim next/prev pointers in backspaced-cell/before-cursor
   before-cursor <- copy prev
@@ -103,7 +100,7 @@ def delete-before-cursor editor:&:editor, screen:&:screen -> editor:&:editor, sc
   cursor-column:num <- get *editor, cursor-column:offset
   # did we just backspace over a newline?
   same-row?:bool <- equal cursor-row, original-row
-  return-unless same-row?
+  return-unless same-row?, 1/go-render
   left:num <- get *editor, left:offset
   right:num <- get *editor, right:offset
   curr:&:duplex-list:char <- next before-cursor
@@ -112,7 +109,7 @@ def delete-before-cursor editor:&:editor, screen:&:screen -> editor:&:editor, sc
   {
     # hit right margin? give up and let caller render
     at-right?:bool <- greater-or-equal curr-column, right
-    return-if at-right?
+    return-if at-right?, 1/go-render
     break-unless curr
     # newline? done.
     currc:char <- get *curr, value:offset
@@ -339,25 +336,23 @@ after <handle-special-key> [
     delete-next-character?:bool <- equal k, 65522/delete
     break-unless delete-next-character?
     <delete-character-begin>
-    editor, screen, go-render?:bool, deleted-cell:&:duplex-list:char <- delete-at-cursor editor, screen
+    go-render?:bool, deleted-cell:&:duplex-list:char <- delete-at-cursor editor, screen
     <delete-character-end>
     return
   }
 ]
 
-def delete-at-cursor editor:&:editor, screen:&:screen -> editor:&:editor, screen:&:screen, go-render?:bool, deleted-cell:&:duplex-list:char [
+def delete-at-cursor editor:&:editor, screen:&:screen -> go-render?:bool, deleted-cell:&:duplex-list:char, editor:&:editor, screen:&:screen [
   local-scope
   load-ingredients
   before-cursor:&:duplex-list:char <- get *editor, before-cursor:offset
   data:&:duplex-list:char <- get *editor, data:offset
   deleted-cell:&:duplex-list:char <- next before-cursor
-  go-render? <- copy 0/false
-  return-unless deleted-cell
+  return-unless deleted-cell, 0/don't-render
   currc:char <- get *deleted-cell, value:offset
   data <- remove deleted-cell, data
   deleted-newline?:bool <- equal currc, 10/newline
-  go-render? <- copy 1/true
-  return-if deleted-newline?
+  return-if deleted-newline?, 1/go-render
   # wasn't a newline? render rest of line
   curr:&:duplex-list:char <- next before-cursor  # refresh after remove above
   cursor-row:num <- get *editor, cursor-row:offset
@@ -368,8 +363,7 @@ def delete-at-cursor editor:&:editor, screen:&:screen -> editor:&:editor, screen
   {
     # hit right margin? give up and let caller render
     at-right?:bool <- greater-or-equal curr-column, screen-width
-    go-render? <- copy 1/true
-    return-if at-right?
+    return-if at-right?, 1/go-render
     break-unless curr
     # newline? done.
     currc:char <- get *curr, value:offset
@@ -421,7 +415,7 @@ after <handle-special-key> [
     <move-cursor-begin>
     before-cursor <- copy next-cursor
     *editor <- put *editor, before-cursor:offset, before-cursor
-    editor, go-render?:bool <- move-cursor-coordinates-right editor, screen-height
+    go-render?:bool <- move-cursor-coordinates-right editor, screen-height
     screen <- move-cursor screen, cursor-row, cursor-column
     undo-coalesce-tag:num <- copy 2/right-arrow
     <move-cursor-end>
@@ -429,7 +423,7 @@ after <handle-special-key> [
   }
 ]
 
-def move-cursor-coordinates-right editor:&:editor, screen-height:num -> editor:&:editor, go-render?:bool [
+def move-cursor-coordinates-right editor:&:editor, screen-height:num -> go-render?:bool, editor:&:editor [
   local-scope
   load-ingredients
   before-cursor:&:duplex-list:char <- get *editor before-cursor:offset
@@ -447,12 +441,10 @@ def move-cursor-coordinates-right editor:&:editor, screen-height:num -> editor:&
     cursor-column <- copy left
     *editor <- put *editor, cursor-column:offset, cursor-column
     below-screen?:bool <- greater-or-equal cursor-row, screen-height  # must be equal
-    go-render? <- copy 0/false
-    return-unless below-screen?
+    return-unless below-screen?, 0/don't-render
     cursor-row <- subtract cursor-row, 1  # bring back into screen range
     *editor <- put *editor, cursor-row:offset, cursor-row
-    go-render? <- copy 1/true
-    return
+    return 1/go-render
   }
   # if the line wraps, move cursor to start of next row
   {
@@ -471,11 +463,10 @@ def move-cursor-coordinates-right editor:&:editor, screen-height:num -> editor:&
     cursor-column <- copy left
     *editor <- put *editor, cursor-column:offset, cursor-column
     below-screen?:bool <- greater-or-equal cursor-row, screen-height  # must be equal
-    return-unless below-screen?, editor, 0/no-more-render
+    return-unless below-screen?, 0/no-more-render
     cursor-row <- subtract cursor-row, 1  # bring back into screen range
     *editor <- put *editor, cursor-row:offset, cursor-row
-    go-render? <- copy 1/true
-    return
+    return 1/go-render
   }
   # otherwise move cursor one character right
   cursor-column <- add cursor-column, 1
@@ -702,10 +693,9 @@ after <handle-special-key> [
     trace 10, [app], [left arrow]
     # if not at start of text (before-cursor at § sentinel)
     prev:&:duplex-list:char <- prev before-cursor
-    go-render? <- copy 0/false
-    return-unless prev
+    return-unless prev, 0/don't-render
     <move-cursor-begin>
-    editor <- move-cursor-coordinates-left editor
+    move-cursor-coordinates-left editor
     before-cursor <- copy prev
     *editor <- put *editor, before-cursor:offset, before-cursor
     undo-coalesce-tag:num <- copy 1/left-arrow
@@ -971,14 +961,14 @@ after <handle-special-key> [
     move-to-previous-line?:bool <- equal k, 65517/up-arrow
     break-unless move-to-previous-line?
     <move-cursor-begin>
-    editor, go-render? <- move-to-previous-line editor
+    move-to-previous-line editor
     undo-coalesce-tag:num <- copy 3/up-arrow
     <move-cursor-end>
     return
   }
 ]
 
-def move-to-previous-line editor:&:editor -> editor:&:editor, go-render?:bool [
+def move-to-previous-line editor:&:editor -> editor:&:editor [
   local-scope
   load-ingredients
   cursor-row:num <- get *editor, cursor-row:offset
@@ -1001,14 +991,12 @@ def move-to-previous-line editor:&:editor -> editor:&:editor, go-render?:bool [
       break-if at-newline?
       curr:&:duplex-list:char <- before-previous-line curr, editor
       no-motion?:bool <- equal curr, old
-      go-render? <- copy 0/false
       return-if no-motion?
     }
     {
       old <- copy curr
       curr <- before-previous-line curr, editor
       no-motion?:bool <- equal curr, old
-      go-render? <- copy 0/false
       return-if no-motion?
     }
     before-cursor <- copy curr
@@ -1034,14 +1022,6 @@ def move-to-previous-line editor:&:editor -> editor:&:editor, go-render?:bool [
       *editor <- put *editor, cursor-column:offset, cursor-column
       loop
     }
-    go-render? <- copy 0/false
-    return
-  }
-  {
-    # if cursor already at top, do nothing
-    break-unless already-at-top?
-    go-render? <- copy 0/true
-    return
   }
 ]
 
@@ -1326,8 +1306,7 @@ after <handle-special-character> [
     move-to-start-of-line editor
     undo-coalesce-tag:num <- copy 0/never
     <move-cursor-end>
-    go-render? <- copy 0/false
-    return
+    return 0/don't-render
   }
 ]
 
@@ -1339,8 +1318,7 @@ after <handle-special-key> [
     move-to-start-of-line editor
     undo-coalesce-tag:num <- copy 0/never
     <move-cursor-end>
-    go-render? <- copy 0/false
-    return
+    return 0/don't-render
   }
 ]
 
@@ -1502,8 +1480,7 @@ after <handle-special-character> [
     move-to-end-of-line editor
     undo-coalesce-tag:num <- copy 0/never
     <move-cursor-end>
-    go-render? <- copy 0/false
-    return
+    return 0/don't-render
   }
 ]
 
@@ -1515,8 +1492,7 @@ after <handle-special-key> [
     move-to-end-of-line editor
     undo-coalesce-tag:num <- copy 0/never
     <move-cursor-end>
-    go-render? <- copy 0/false
-    return
+    return 0/don't-render
   }
 ]
 
@@ -1651,8 +1627,7 @@ after <handle-special-character> [
     <delete-to-start-of-line-begin>
     deleted-cells:&:duplex-list:char <- delete-to-start-of-line editor
     <delete-to-start-of-line-end>
-    go-render? <- copy 1/true
-    return
+    return 1/go-render
   }
 ]
 
@@ -1789,8 +1764,7 @@ after <handle-special-character> [
     <delete-to-end-of-line-begin>
     deleted-cells:&:duplex-list:char <- delete-to-end-of-line editor
     <delete-to-end-of-line-end>
-    go-render? <- copy 1/true
-    return
+    return 1/go-render
   }
 ]
 
diff --git a/sandbox/004-programming-environment.mu b/sandbox/004-programming-environment.mu
index c32501a6..84898f71 100644
--- a/sandbox/004-programming-environment.mu
+++ b/sandbox/004-programming-environment.mu
@@ -104,7 +104,7 @@ def event-loop screen:&:screen, console:&:console, env:&:environment -> screen:&
     # if it's not global and not a touch event, send to appropriate editor
     {
       hide-screen screen
-      screen, current-sandbox, render?:bool <- handle-keyboard-event screen, current-sandbox, e:event
+      render?:bool <- handle-keyboard-event screen, current-sandbox, e:event
       # refresh screen only if no more events
       # if there are more events to process, wait for them to clear up, then make sure you render-all afterward.
       more-events?:bool <- has-more-events? console
diff --git a/sandbox/012-editor-undo.mu b/sandbox/012-editor-undo.mu
index a3e4956d..bf64cd75 100644
--- a/sandbox/012-editor-undo.mu
+++ b/sandbox/012-editor-undo.mu
@@ -74,7 +74,7 @@ after <handle-special-character> [
     redo <- push op, redo
     *editor <- put *editor, redo:offset, redo
     <handle-undo>
-    return screen, editor, 1/go-render
+    return 1/go-render
   }
 ]
 
@@ -92,7 +92,7 @@ after <handle-special-character> [
     undo <- push op, undo
     *editor <- put *editor, undo:offset, undo
     <handle-redo>
-    return screen, editor, 1/go-render
+    return 1/go-render
   }
 ]