fix local capture.

Author: vddCore

VirtualMachine/EVIL.Ceres/ExecutionEngine/Diagnostics/Chunk.cs

@@ -355,6 +355,16 @@ public static Chunk Deserialize(Stream stream, out byte version, out long timest
 
     public Chunk Clone()
     {
+        var contexts = new Dictionary<string, ClosureContext>();
+        foreach (var kvp in _closureContexts)
+        {
+            contexts[kvp.Key] = new ClosureContext(kvp.Value.EnclosedFunctionName);
+            foreach (var kvp2 in kvp.Value.Values)
+            {
+                contexts[kvp.Key].Values[kvp2.Key] = kvp2.Value;
+            }
+        }
+        
         var clone = new Chunk(
             Name,
             _code.ToArray(),
@@ -369,7 +379,7 @@ public Chunk Clone()
             IsSelfAware = IsSelfAware,
             _subChunks = new(_subChunks),
             _closures = new(_closures),
-            _closureContexts = new(_closureContexts),
+            _closureContexts = contexts,
             _labels = new(_labels),
             _attributes = new(_attributes),
             _parameterInitializers = new(_parameterInitializers),

VirtualMachine/EVIL.Ceres/ExecutionEngine/ExecutionUnit.cs

@@ -1088,7 +1088,18 @@ public void Step()
                     }
                     else
                     {
-                        PushValue(targetFrame.Locals![closureInfo.EnclosedId]);
+                        if (frame.Chunk.ClosureContexts.ContainsKey(closureInfo.EnclosedFunctionName))
+                        {
+                            PushValue(
+                                frame.Chunk.ClosureContexts[
+                                    closureInfo.EnclosedFunctionName
+                                ].Values[closureInfo.EnclosedId]
+                            );
+                        }
+                        else
+                        {
+                            PushValue(targetFrame.Locals![closureInfo.EnclosedId]);
+                        }
                     }
                 }
                 else

VirtualMachine/Tests/EVIL.Ceres.LanguageTests/tests/000_regression.vil

@@ -1,82 +1,43 @@
-//#[test;disasm("always")]
-//fn for_loop_table_fill {
-//  val t = {};
-//  
-//  for (rw val i = 0; i < 4; i++) {
-//    t[i] = i;
-//  }
-//  
-//  assert.equal(t[0], 0);
-//  assert.equal(t[1], 1);
-//  assert.equal(t[2], 2);
-//  assert.equal(t[3], 3);
-//}
-//
-//#[test;disasm("always")]
-//fn for_loop_closure_capture {
-//  val funcs = {};
-//  
-//  for (rw val i = 0; i < 3; i++) {
-//    funcs[i] = fn -> i;
-//  }
-//
-//  assert.equal(funcs[0](), 0);
-//  assert.equal(funcs[1](), 1);
-//  assert.equal(funcs[2](), 2);
-//}
+#[test]
+fn for_loop_table_fill {
+  val t = {};
 
-fn delay(ms) { 
-  val end = time.stamp.ms + ms;
-  while(time.stamp.ms < end){}
+  for (rw val i = 0; i < 4; i++) {
+    t[i] = i;
+  }
 
-  ret 2.137;
+  assert.equal(t[0], 0);
+  assert.equal(t[1], 1);
+  assert.equal(t[2], 2);
+  assert.equal(t[3], 3);
 }
 
+
 #[test]
-fn yield_zombie {
-  rw val outer_arg = nil;
-  rw val zombified = false;
+fn for_loop_closure_capture {
+  val funcs = {};
 
-  loc fn dies_and_rises(rw arg) {
-    rw val zombified_2 = false;
-    
-    loc fn dies_and_rises_2 {
-      if (!zombified_2) {
-        arg = 12;
-        zombified_2 = true;
-        yield<delay>(10);
-        yield<dies_and_rises_2>();
-        
-        throw arg;
-      }
-    }
+  for (rw val i = 0; i < 3; i++) {
+    funcs[i] = fn -> i;
+  }
 
-    if (!zombified) {
-      zombified = true;
-      yield<delay>(10);
-      yield<dies_and_rises>();
-      
-      try {
-        yield<dies_and_rises_2>();
-      } catch (e) {
-        outer_arg = e;
-      }
-    }
+  assert.equal(funcs[0](), 0);
+  assert.equal(funcs[1](), 1);
+  assert.equal(funcs[2](), 2);
+}
 
-    ret "undead";
-  }
+fn delay(ms) { 
+  val end = time.stamp.ms + ms;
+  while(time.stamp.ms < end){}
 
-  zombified = false;
-  val result = yield<dies_and_rises>();
-  assert.equal(outer_arg, 12);
-  assert.equal(result, "undead");
+  ret 2.137;
 }
 
 #[test]
 fn tonum_indexing {
   val data = { a: { b: { c: "1", d: "2", e: "3", f: "4" } } };
   val x = $data.a.b.c * $data.a.b.d;
-  
+
   assert.equal(x, 2);
 }
 

VirtualMachine/Tests/EVIL.Ceres.LanguageTests/tests/019_closures.vil

@@ -177,7 +177,7 @@ fn many_subchunks_capture_same_local_no_change {
 }
 
 #[test]
-fn many_subchunks_capture_same_local_after_change {
+fn many_subchunks_capture_local_value_after_change {
   rw val local_a = 11;
   val f1 = fn(x) -> local_a + x;
 
@@ -192,7 +192,7 @@ fn many_subchunks_capture_same_local_after_change {
 
   val result = f1(2) + f2(4) + f3(5) + f4(4);
 
-  assert.equal(result, 47);
+  assert.equal(result, 59);
 }
 
 fn invoke_func_out_of_scope(f) -> f();

VirtualMachine/Tests/EVIL.Ceres.LanguageTests/tests/099_yield.vil

@@ -226,36 +226,4 @@ fn catcher {
 fn yield_stack_unwind {
   val result = yield<catcher>();
   assert.equal(result, "caught: error mid-yield");
-}
-
-#[test]
-fn yield_zombie {
-  rw val zombified = false;
-
-  loc fn dies_and_rises {
-    rw val zombified_2 = false;
-    
-    loc fn dies_and_rises_2 {
-      if (!zombified_2) {
-        zombified_2 = true;
-        yield<delay>(10);
-        yield<dies_and_rises_2>();
-        throw "aaa";
-      }
-    }
-
-    if (!zombified) {
-      zombified = true;
-      yield<delay>(10);
-      yield<dies_and_rises>();
-      
-      try yield<dies_and_rises_2>();
-    }
-
-    ret "undead";
-  }
-
-  zombified = false;
-  val result = yield<dies_and_rises>();
-  assert.equal(result, "undead");
 }