From 5d43ce4ab4b9c8d3ca8a0cb21f99b25e87e58fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= <edvard.thornros@gmail.com>
Date: Wed, 20 Jan 2021 22:30:57 +0100
Subject: Calling of functions, in functions

---
 src/vm.rs | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

(limited to 'src/vm.rs')

diff --git a/src/vm.rs b/src/vm.rs
index abe7874..cb2285f 100644
--- a/src/vm.rs
+++ b/src/vm.rs
@@ -369,7 +369,29 @@ impl VM {
             }
 
             Op::Constant(value) => {
-                self.stack.push(value.clone());
+                let offset = self.frame().stack_offset;
+                let value = match value {
+                    Value::Function(_, block) => {
+                        let mut ups = Vec::new();
+                        println!("UPS: {:?}", block.ups);
+                        for (slot, is_up, _) in block.ups.iter() {
+                            let up = if *is_up {
+                                if let Value::Function(local_ups, _) = &self.stack[offset] {
+                                    Rc::clone(&local_ups[*slot])
+                                } else {
+                                    unreachable!()
+                                }
+                            } else {
+                                let slot = self.frame().stack_offset + slot;
+                                Rc::clone(self.find_upvalue(slot))
+                            };
+                            ups.push(up);
+                        }
+                        Value::Function(ups, block)
+                    },
+                    _ => value.clone(),
+                };
+                self.stack.push(value);
             }
 
             Op::Neg => {
@@ -521,7 +543,7 @@ impl VM {
             Op::Call(num_args) => {
                 let new_base = self.stack.len() - 1 - num_args;
                 match &self.stack[new_base] {
-                    Value::Function(ups, block) => {
+                    Value::Function(_, block) => {
                         let args = block.args();
                         if args.len() != num_args {
                             error!(self,
@@ -555,6 +577,7 @@ impl VM {
                     return Ok(OpResult::Done);
                 } else {
                     self.stack[last.stack_offset] = self.stack.pop().unwrap();
+                    self.stack.truncate(last.stack_offset + 1);
                 }
             }
         }
@@ -613,6 +636,10 @@ impl VM {
 
             Op::Jmp(_line) => {}
 
+            Op::Constant(value) => {
+                self.stack.push(value.clone());
+            }
+
             Op::ReadUpvalue(slot) => {
                 self.stack.push(self.frame().block.ups[slot].2.as_value());
             }
-- 
cgit v1.2.1