463 - mu now has closures

2 files changed, 44 insertions, 7 deletions

diff --git a/mu.arc b/mu.arc
index 6a22c69b..c53a6ccd 100644
--- a/mu.arc
+++ b/mu.arc
@@ -750,15 +750,23 @@
           (die "routine has no globals: @operand"))
       :else
         (iflet base rep.routine*!call-stack.0!default-scope
-;?                (do (prn 313 " " operand " " base)
-          (if (< v.operand memory*.base)
-            `((,(+ base 1 v.operand) ,@(cdr operand.0))
-              ,@metadata.operand
-              (raw))
-            (die "no room for var @operand in routine of size @memory*.base"))
-;?                 )
+          (lookup-space (rem [caris _ 'space] operand)
+                        base
+                        space.operand)
           operand)))
 
+(def lookup-space (operand base space)
+  (if (is 0 space)
+    ; base case
+    (if (< v.operand memory*.base)
+      `((,(+ base 1 v.operand) ,@(cdr operand.0))
+        ,@metadata.operand
+        (raw))
+      (die "no room for var @operand in routine of size @memory*.base"))
+    ; recursive case
+    (lookup-space operand (memory* (+ base 1))  ; location 0 points to parent space
+                  (- space 1))))
+
 (def space (operand)
   (or (alref operand 'space)
       0))
diff --git a/mu.arc.t b/mu.arc.t
index 4f33dd6d..b1d6937b 100644
--- a/mu.arc.t
+++ b/mu.arc.t
@@ -2038,6 +2038,35 @@
   (prn "F - multiple calls to a function can share locals"))
 ;? (quit)
 
+(reset)
+(new-trace "default-scope-closure")
+(add-code
+  '((function init-counter [
+      (default-scope:scope-address <- new scope:literal 30:literal)
+      (1:integer <- copy 3:literal)  ; initialize to 3
+      (reply default-scope:scope-address)
+     ])
+    (function increment-counter [
+      (default-scope:scope-address <- new scope:literal 30:literal)
+      (0:scope-address <- next-input)  ; share outer scope
+      (1:integer/space:1 <- add 1:integer/space:1 1:literal)  ; increment
+      (1:integer <- copy 34:literal)  ; dummy
+      (reply 1:integer/space:1)
+     ])
+    (function main [
+      (1:scope-address <- init-counter)
+      (2:integer <- increment-counter 1:scope-address)
+      (3:integer <- increment-counter 1:scope-address)
+     ])))
+(run 'main)
+(each routine completed-routines*
+  (aif rep.routine!error (prn "error - " it)))
+;? (prn memory*)
+(if (or (~is memory*.2 4)
+        (~is memory*.3 5))
+  (prn "F - multiple calls to a function can share locals"))
+;? (quit)
+
 )  ; section 20
 
 (section 100