Fix(vm): Propagate all outer-scope slots into call frames, not only functions.

Author: dylan-sutton-chavez

compiler/main.py

@@ -0,0 +1,37 @@
+def fac(n):
+    r = 1
+    for i in range(2, n + 1):
+        r *= i
+    return r
+
+def isqrt(n):
+    if n == 0: return 0
+    x = n
+    for _ in range(300):
+        y = (x + n // x) // 2
+        if y >= x:
+            return x
+        x = y
+    return x
+
+def pi(digits):
+    terms = digits // 14 + 3
+    C3 = 640320 ** 3
+
+    S_num = 0
+    S_den = 1
+
+    for k in range(terms):
+        a = fac(6*k) * (13591409 + 545140134 * k)
+        b = fac(3*k) * fac(k)**3 * C3**k
+        if k % 2 == 0:
+            S_num = S_num * b + a * S_den
+        else:
+            S_num = S_num * b - a * S_den
+        S_den = S_den * b
+
+    scale = 10 ** (digits + 20)
+    sq = isqrt(10005 * scale * scale)
+    return 426880 * sq * S_den // (S_num * scale) // 10**20
+
+print(pi(1000))

compiler/src/modules/parser/expr.rs

@@ -370,8 +370,8 @@ impl<'src, I: Iterator<Item = Token>> Parser<'src, I> {
         self.eat(TokenType::Colon);
 
         let saved_chunk = core::mem::take(&mut self.chunk);
-        let saved_ver   = core::mem::take(&mut self.ssa_versions);
-        self.ssa_versions = hashbrown::HashMap::new();
+        let saved_ver = core::mem::take(&mut self.ssa_versions);
+        self.ssa_versions = saved_ver.clone();
         for p in &params {
             self.ssa_versions.insert(p.clone(), 0);
         }

compiler/src/modules/parser/literals.rs

@@ -319,7 +319,7 @@ impl<'src, I: Iterator<Item = Token>> Parser<'src, I> {
 
         let saved_chunk = core::mem::take(&mut self.chunk);
         let saved_ver   = core::mem::take(&mut self.ssa_versions);
-        self.ssa_versions = HashMap::new();
+        self.ssa_versions = saved_ver.clone();
 
         self.compile_block();
 
@@ -426,7 +426,7 @@ impl<'src, I: Iterator<Item = Token>> Parser<'src, I> {
         let saved_chunk = core::mem::take(&mut self.chunk);
         let saved_ver   = core::mem::take(&mut self.ssa_versions);
 
-        self.ssa_versions = HashMap::new();
+        self.ssa_versions = saved_ver.clone();
         for p in params {
             self.ssa_versions.insert(p.clone(), 0);
         }

compiler/src/modules/vm/mod.rs

@@ -540,10 +540,8 @@ impl<'a> VM<'a> {
                     }
                     for (si, sv) in slots.iter().enumerate() {
                         if let Some(v) = sv {
-                            if v.is_heap() {
-                                if let HeapObj::Func(_, _) = self.heap.get(*v) {
-                                    if let Some(&bs) = body_map.get(chunk.names[si].as_str()) { fn_slots[bs] = Some(*v); }
-                                }
+                            if let Some(&bs) = body_map.get(chunk.names[si].as_str()) {
+                                if fn_slots[bs].is_none() { fn_slots[bs] = Some(*v); }
                             }
                         }
                     }

compiler/tests/cases/vm_cases.json

@@ -211,5 +211,6 @@
   {"src": "print(abs(-2**100))", "output": ["1267650600228229401496703205376"], "result": "None"},
   {"src": "print(int(2**100))", "output": ["1267650600228229401496703205376"], "result": "None"},
   {"src": "x = 99999999999999999999\nprint(x)", "output": ["99999999999999999999"], "result": "None"},
-  {"src": "scale = 1\nfor _ in range(110):\n    scale = scale * 10\nterm_a = scale // 5\nprint(term_a)", "output": ["20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"], "result": "None"}
+  {"src": "scale = 1\nfor _ in range(110):\n    scale = scale * 10\nterm_a = scale // 5\nprint(term_a)", "output": ["20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"], "result": "None"},
+  {"src": "x = 42\ndef f():\n    return x\nprint(f())", "output": ["42"], "result": "None"}
 ]