second test fails idk why

Author: aceinetx

zenlang/src/value.rs

@@ -25,7 +25,7 @@ pub enum Value {
     String(String),
     Boolean(bool),
     FunctionRef(u64, u64),
-    FunctionRefEnv(u64, u64, Rc<RefCell<Environment>>),
+    FunctionRefEnv(u64, u64, Weak<RefCell<Environment>>),
     Object(Rc<RefCell<Object>>),
     Null(),
 }

zenlang/src/vm/opcodes/vm_call.rs

@@ -2,6 +2,7 @@ use crate::strong_u64::U64BitsControl;
 use crate::value::*;
 use crate::vm::VM;
 use alloc::format;
+//use alloc::rc::Rc;
 use alloc::string::*;
 
 impl VM {
@@ -40,7 +41,11 @@ impl VM {
                     self.check_stack_overflow();
                     self.pc = addr;
 
-                    self.environs.push(env);
+                    if let Some(env) = env.upgrade() {
+                        self.environs.push(env);
+                    } else {
+                        //self.push_environment();
+                    }
 
                     let this_name = &String::from("self");
                     let environ = self.environs.last_mut().unwrap();

zenlang/src/vm/opcodes/vm_closure.rs

@@ -1,13 +1,14 @@
 use crate::strong_u64::U64BitsControl;
 use crate::value::Value;
 use crate::vm::VM;
+use alloc::rc::*;
 
 impl VM {
     pub fn op_closure(&mut self, skip: u32, args: u64) {
         let value = Value::FunctionRefEnv(
             self.pc.get_low() as u64,
             args,
-            self.environs.last().unwrap().clone(),
+            Rc::downgrade(self.environs.last().unwrap()),
         );
 
         self.pc.add_low(skip);

zenlang/src/vm/vm.rs

@@ -184,25 +184,24 @@ impl VM {
         if self.environs.len() == 0 {
             panic!("pop_environment: environs is empty");
         }
-        // Fuck reference counted ptrs
-        // Why do I have to count references, MANUALLY
-        // (there is probably a better way to do this, but time's ticking)
-        let environ = self.environs.last().unwrap();
-        let mut refs: usize = 0;
-        for e in self.environs.iter() {
-            if Rc::ptr_eq(e, environ) {
-                refs += 1;
+
+        let mut in_use = false;
+        let env = self.environs.last().unwrap();
+        for environ in self.environs.iter() {
+            for var in (&*environ.borrow()).vars.iter() {
+                if let Value::FunctionRefEnv(_, _, e) = &var.1 {
+                    if let Some(e) = &e.upgrade() {
+                        if Rc::ptr_eq(env, e) {
+                            in_use = true;
+                        }
+                    }
+                }
             }
         }
 
-        // If refs != 1, the vars are prolly used somewhere else so don't clear them
-        // TODO: This doesn't work and doesn't pass the fourth test in vm_closure.rs, instead we
-        // should try using weak ptr's
-        if refs == 1 {
-            (&mut *environ.borrow_mut()).vars.clear();
+        if !in_use {
+            //self.environs.pop();
         }
-
-        self.environs.pop();
     }
 
     pub fn get_function_name_from_pc(&mut self, pc: u64) -> Option<String> {

zenlang/tests/vm_closure.rs

@@ -126,9 +126,8 @@ fn closure array {
 
 fn main {
     let arr = [];
-    let f =closure(arr);
 
-    return f();
+    return closure(arr)();
 }
     "#
         .into(),