1 files changed, 45 insertions, 25 deletions
diff --git a/shell/global.mu b/shell/global.mu
index 72b4a178..0e7038e9 100644
--- a/shell/global.mu
+++ b/shell/global.mu
@@ -145,45 +145,65 @@ fn append-global _self: (addr global-table), name: (addr array byte), value: (ha
 
 fn lookup-symbol-in-globals _sym: (addr cell), out: (addr handle cell), _globals: (addr global-table), trace: (addr trace) {
   var sym/eax: (addr cell) <- copy _sym
-  var sym-data-ah/eax: (addr handle stream byte) <- get sym, text-data
-  var _sym-data/eax: (addr stream byte) <- lookup *sym-data-ah
-  var sym-data/edx: (addr stream byte) <- copy _sym-data
+  var sym-name-ah/eax: (addr handle stream byte) <- get sym, text-data
+  var _sym-name/eax: (addr stream byte) <- lookup *sym-name-ah
+  var sym-name/edx: (addr stream byte) <- copy _sym-name
   var globals/esi: (addr global-table) <- copy _globals
   {
     compare globals, 0
     break-if-=
+    var curr-index/ecx: int <- find-symbol-in-globals globals, sym-name
+    compare curr-index, -1/not-found
+    break-if-=
     var global-data-ah/eax: (addr handle array global) <- get globals, data
     var global-data/eax: (addr array global) <- lookup *global-data-ah
-    var final-index/ecx: (addr int) <- get globals, final-index
-    var curr-index/ecx: int <- copy *final-index
-    {
-      compare curr-index, 0
-      break-if-<
-      var curr-offset/ebx: (offset global) <- compute-offset global-data, curr-index
-      var curr/ebx: (addr global) <- index global-data, curr-offset
-      var curr-name-ah/eax: (addr handle array byte) <- get curr, name
-      var curr-name/eax: (addr array byte) <- lookup *curr-name-ah
-      var found?/eax: boolean <- stream-data-equal? sym-data, curr-name
-      {
-        compare found?, 0/false
-        break-if-=
-        var curr-value/eax: (addr handle cell) <- get curr, value
-        copy-object curr-value, out
-        return
-      }
-      curr-index <- decrement
-      loop
-    }
+    var curr-offset/ebx: (offset global) <- compute-offset global-data, curr-index
+    var curr/ebx: (addr global) <- index global-data, curr-offset
+    var curr-value/eax: (addr handle cell) <- get curr, value
+    copy-object curr-value, out
+    return
   }
   # otherwise error "unbound symbol: ", sym
   var stream-storage: (stream byte 0x40)
   var stream/ecx: (addr stream byte) <- address stream-storage
   write stream, "unbound symbol: "
-  rewind-stream sym-data
-  write-stream stream, sym-data
+  rewind-stream sym-name
+  write-stream stream, sym-name
   trace trace, "error", stream
 }
 
+# return the index in globals containing 'sym'
+# or -1 if not found
+fn find-symbol-in-globals _globals: (addr global-table), sym-name: (addr stream byte) -> _/ecx: int {
+  var globals/esi: (addr global-table) <- copy _globals
+  compare globals, 0
+  {
+    break-if-!=
+    return -1/not-found
+  }
+  var global-data-ah/eax: (addr handle array global) <- get globals, data
+  var global-data/eax: (addr array global) <- lookup *global-data-ah
+  var final-index/ecx: (addr int) <- get globals, final-index
+  var curr-index/ecx: int <- copy *final-index
+  {
+    compare curr-index, 0
+    break-if-<
+    var curr-offset/ebx: (offset global) <- compute-offset global-data, curr-index
+    var curr/ebx: (addr global) <- index global-data, curr-offset
+    var curr-name-ah/eax: (addr handle array byte) <- get curr, name
+    var curr-name/eax: (addr array byte) <- lookup *curr-name-ah
+    var found?/eax: boolean <- stream-data-equal? sym-name, curr-name
+    compare found?, 0/false
+    {
+      break-if-=
+      return curr-index
+    }
+    curr-index <- decrement
+    loop
+  }
+  return -1/not-found
+}
+
 # a little strange; goes from value to name and selects primitive based on name
 fn apply-primitive _f: (addr cell), args-ah: (addr handle cell), out: (addr handle cell), env-h: (handle cell), _globals: (addr global-table), trace: (addr trace) {
   var f/esi: (addr cell) <- copy _f