FINALLY

Author: aceinetx

zenlang/src/value.rs

@@ -1,7 +1,6 @@
 //! Value
 //!
 //! ZenLang variable value
-use crate::environment::Environment;
 use crate::strong_u64::U64BitsControl;
 use crate::vm::VM;
 use alloc::collections::btree_map::BTreeMap;

zenlang/src/vm/opcodes/vm_call.rs

@@ -2,8 +2,6 @@ use crate::strong_u64::U64BitsControl;
 use crate::value::*;
 use crate::vm::VM;
 use alloc::format;
-use alloc::rc::Rc;
-//use alloc::rc::Rc;
 use alloc::string::*;
 
 impl VM {

zenlang/src/vm/vm.rs

@@ -1,14 +1,10 @@
-use core::cell::RefCell;
-
-use crate::environment;
 use crate::environment::Environment;
 use crate::module::Module;
 use crate::platform::Platform;
 use crate::strong_u64::*;
 use crate::value::*;
 use alloc::boxed::*;
 use alloc::format;
-use alloc::rc::*;
 use alloc::string::*;
 use alloc::vec::*;
 
@@ -210,11 +206,15 @@ impl VM {
             return true;
         }
 
+        for environ in self.environs_stack.iter() {
+            if *environ == id {
+                return true;
+            }
+        }
+
         for value in self.stack.iter() {
-            if let Value::FunctionRefEnv(_, _, i) = value {
-                if *i == id {
-                    return true;
-                }
+            if self.is_environ_used_in(id, value) {
+                return true;
             }
         }
 

zenlang/tests/vm_stdlib.rs

@@ -332,6 +332,9 @@ fn vm_test_stdlib_clone() {
 fn main {
     let a1 = [1,2,3];
     let a2 = clone(a1);
+    if a2 == null {
+        return "a2 is null!";
+    }
     let a1[0] = 0;
     return a2[0];
 }