7037

Expanding words now working, but ctrl-f/ctrl-b inside expanded words not
working right.

2 files changed, 6 insertions, 7 deletions

diff --git a/apps/tile/environment.mu b/apps/tile/environment.mu
index 5113d4e3..b8de4cf1 100644
--- a/apps/tile/environment.mu
+++ b/apps/tile/environment.mu
@@ -591,8 +591,9 @@ fn render-line screen: (addr screen), functions: (addr handle function), binding
       # obtain body
       var callee-body-ah/eax: (addr handle line) <- get callee, body
       var callee-body/eax: (addr line) <- lookup *callee-body-ah
+      var callee-body-first-word/edx: (addr handle word) <- get callee-body, data
       # - render subsidiary stack
-      push-to-call-path-element curr-path, 0  # leak
+      push-to-call-path-element curr-path, callee-body-first-word  # leak
       curr-col <- render-line screen, functions, callee-bindings, callee-body, expanded-words, top-row, curr-col, curr-path, cursor-word, cursor-call-path, cursor-col-a
       drop-from-call-path-element curr-path
       #
diff --git a/apps/tile/main.mu b/apps/tile/main.mu
index 24d82fbf..045c8374 100644
--- a/apps/tile/main.mu
+++ b/apps/tile/main.mu
@@ -75,17 +75,15 @@ fn test {
   var env-storage: environment
   var env/esi: (addr environment) <- address env-storage
   initialize-environment-with-fake-screen env, 5, 0xa
-  var g/eax: grapheme <- copy 0x61  # 'a'
+  var g/eax: grapheme <- copy 0x31  # '1'
   process env, g
   g <- copy 0x20  # space
   process env, g
-  g <- copy 0x62  # 'b'
+  g <- copy 0x32  # '2'
   process env, g
-  g <- copy 0x20  # space
-  process env, g
-  g <- copy 0x63  # 'c'
+  g <- copy 0x2a  # '*'
   process env, g
-  g <- copy 2  # 'ctrl-b'
+  g <- copy 0xa  # newline
   process env, g
   render env
 }