about summary refs log tree commit diff stats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/tile/environment.mu36
1 files changed, 25 insertions, 11 deletions
diff --git a/apps/tile/environment.mu b/apps/tile/environment.mu
index b8de4cf1..0aad72f2 100644
--- a/apps/tile/environment.mu
+++ b/apps/tile/environment.mu
@@ -185,13 +185,23 @@ $process:body: {
         increment-final-element cursor-call-path
         # Is the new cursor word expanded? If so, it's a function call. Add a
         # new level to the cursor-call-path for the call's body.
-        {
+        $process:key-right-arrow-next-word-is-call-expanded: {
 #?           print-string 0, "c\n"
-          var expanded-words/eax: (addr handle call-path) <- get sandbox, expanded-words
-          var curr-word-is-expanded?/eax: boolean <- find-in-call-path expanded-words, cursor-call-path
-          compare curr-word-is-expanded?, 0  # false
-          break-if-=
-          push-to-call-path-element cursor-call-path, 0
+          {
+            var expanded-words/eax: (addr handle call-path) <- get sandbox, expanded-words
+            var curr-word-is-expanded?/eax: boolean <- find-in-call-path expanded-words, cursor-call-path
+            compare curr-word-is-expanded?, 0  # false
+            break-if-= $process:key-right-arrow-next-word-is-call-expanded
+          }
+          var callee-h: (handle function)
+          var callee-ah/edx: (addr handle function) <- address callee-h
+          var functions/ebx: (addr handle function) <- get self, functions
+          callee functions, next-word, callee-ah
+          var callee/eax: (addr function) <- lookup *callee-ah
+          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
+          push-to-call-path-element cursor-call-path, callee-body-first-word
           # position cursor at left
           var cursor-call-path-ah/eax: (addr handle call-path-element) <- get sandbox, cursor-call-path
           var cursor-call-path/eax: (addr call-path-element) <- lookup *cursor-call-path-ah
@@ -552,12 +562,9 @@ fn render-line screen: (addr screen), functions: (addr handle function), binding
       # does function exist?
       var callee/edi: (addr function) <- copy 0
       {
-        var curr-stream-storage: (stream byte 0x10)
-        var curr-stream/esi: (addr stream byte) <- address curr-stream-storage
-        emit-word curr-word, curr-stream
         var callee-h: (handle function)
-        var callee-ah/eax: (addr handle function) <- address callee-h
-        find-function functions, curr-stream, callee-ah
+        var callee-ah/ecx: (addr handle function) <- address callee-h
+        callee functions, curr-word, callee-ah
         var _callee/eax: (addr function) <- lookup *callee-ah
         callee <- copy _callee
         compare callee, 0
@@ -632,6 +639,13 @@ fn render-line screen: (addr screen), functions: (addr handle function), binding
   right-col <- copy curr-col
 }
 
+fn callee functions: (addr handle function), word: (addr word), out: (addr handle function) {
+  var stream-storage: (stream byte 0x10)
+  var stream/esi: (addr stream byte) <- address stream-storage
+  emit-word word, stream
+  find-function functions, stream, out
+}
+
 # Render:
 #   - starting at top-row, left-col: final-word
 #   - starting somewhere below at left-col: the stack result from interpreting first-world to final-word (inclusive)
88f7f123d5c0a4eb'>b2cb4662 ^
f736a248 ^








458f9edb ^
f736a248 ^

24a60449 ^





ee8ec99e ^
0a1e8d9c ^
458f9edb ^
0a1e8d9c ^
458f9edb ^
59c9e23b ^
0a1e8d9c ^
24a60449 ^

2b88e2f1 ^
76fe37ef ^

2b88e2f1 ^
76fe37ef ^
80b2aa0f ^
2b88e2f1 ^
76fe37ef ^
99fc7c5e ^
76fe37ef ^










bdb8ea3f ^


76fe37ef ^




ee8ec99e ^











2b88e2f1 ^
8f0bc28b ^

2b88e2f1 ^
8f0bc28b ^
80b2aa0f ^
2b88e2f1 ^
8f0bc28b ^

192656e5 ^
8f0bc28b ^










bdb8ea3f ^


8f0bc28b ^




76fe37ef ^





2b88e2f1 ^

76fe37ef ^







0a1e8d9c ^






7f962895 ^
76fe37ef ^

7f962895 ^


04605a5f ^
7f962895 ^
f736a248 ^

fceec61a ^

7f962895 ^
24a60449 ^




76fe37ef ^


7f962895 ^

76fe37ef ^

24a60449 ^
2b88e2f1 ^
8f0bc28b ^
24a60449 ^

2b88e2f1 ^
8f0bc28b ^
76fe37ef ^
b2cb4662 ^
2b88e2f1 ^
3c5d5e2e ^
b2cb4662 ^

f736a248 ^
2b88e2f1 ^
f736a248 ^


24a60449 ^
2b88e2f1 ^
8f0bc28b ^
76fe37ef ^


76fe37ef ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216