From 85411e444826fc239fb268da03572993d9c9fd83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= Date: Wed, 20 Jan 2021 21:04:18 +0100 Subject: Add in upvalues --- src/vm.rs | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 92 insertions(+), 10 deletions(-) (limited to 'src/vm.rs') diff --git a/src/vm.rs b/src/vm.rs index 3041628..7b48b4e 100644 --- a/src/vm.rs +++ b/src/vm.rs @@ -3,6 +3,7 @@ use std::collections::HashMap; use std::fmt::Debug; use std::path::{Path, PathBuf}; use std::rc::Rc; +use std::cell::RefCell; use crate::compiler::Type; use crate::error::{Error, ErrorKind}; @@ -22,11 +23,53 @@ pub enum Value { Int(i64), Bool(bool), String(Rc), - Function(Rc), + Function(Vec>>, Rc), Unkown, Nil, } +#[derive(Clone, Debug)] +pub struct UpValue { + slot: usize, + value: Value, +} + +impl UpValue { + + fn new(value: usize) -> Self { + Self { + slot: value, + value: Value::Nil, + } + } + + fn get(&self, stack: &[Value]) -> Value { + if self.is_closed() { + self.value.clone() + } else { + stack[self.slot].clone() + } + } + + fn set(&mut self, stack: &mut [Value], value: Value) { + if self.is_closed() { + self.value = value; + } else { + stack[self.slot] = value; + } + } + + + fn is_closed(&self) -> bool { + self.slot == 0 + } + + fn close(&mut self, value: Value) { + self.slot = 0; + self.value = value; + } +} + impl Debug for Value { fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { @@ -34,7 +77,7 @@ impl Debug for Value { Value::Int(i) => write!(fmt, "(int {})", i), Value::Bool(b) => write!(fmt, "(bool {})", b), Value::String(s) => write!(fmt, "(string \"{}\")", s), - Value::Function(block) => write!(fmt, "(fn {}: {:?})", block.name, block.ty), + Value::Function(_, block) => write!(fmt, "(fn {}: {:?})", block.name, block.ty), Value::Unkown => write!(fmt, "(unkown)"), Value::Nil => write!(fmt, "(nil)"), } @@ -57,7 +100,7 @@ impl Value { Value::Int(_) => Type::Int, Value::Bool(_) => Type::Bool, Value::String(_) => Type::String, - Value::Function(block) => block.ty.clone(), + Value::Function(_, block) => block.ty.clone(), Value::Unkown => Type::UnknownType, Value::Nil => Type::Void, } @@ -69,6 +112,7 @@ pub enum Op { Illegal, Pop, + PopUpvalue, Constant(Value), Add, @@ -92,7 +136,10 @@ pub enum Op { Unreachable, ReadLocal(usize), - Assign(usize), + AssignLocal(usize), + + ReadUpvalue(usize), + AssignUpvalue(usize), Define(Type), @@ -105,6 +152,7 @@ pub enum Op { #[derive(Debug)] pub struct Block { pub ty: Type, + pub ups: Vec, pub name: String, pub file: PathBuf, @@ -118,6 +166,7 @@ impl Block { pub fn new(name: &str, file: &Path, line: usize) -> Self { Self { ty: Type::Void, + ups: Vec::new(), name: String::from(name), file: file.to_owned(), ops: Vec::new(), @@ -222,6 +271,8 @@ struct Frame { #[derive(Debug)] pub struct VM { + upvalues: HashMap>>, + stack: Vec, frames: Vec, print_blocks: bool, @@ -236,6 +287,7 @@ enum OpResult { impl VM { pub fn new() -> Self { Self { + upvalues: HashMap::new(), stack: Vec::new(), frames: Vec::new(), print_blocks: false, @@ -253,6 +305,11 @@ impl VM { self } + fn find_upvalue(&mut self, slot: usize) -> &mut Rc> { + self.upvalues.entry(slot).or_insert( + Rc::new(RefCell::new(UpValue::new(slot)))) + } + fn pop(&mut self) -> Value { self.stack.pop().unwrap() } @@ -304,7 +361,11 @@ impl VM { } Op::Pop => { - self.stack.pop(); + self.stack.pop().unwrap(); + } + + Op::PopUpvalue => { + self.stack.pop().unwrap(); } Op::Constant(value) => { @@ -424,12 +485,33 @@ impl VM { self.stack.push(Value::Bool(true)); } + Op::ReadUpvalue(slot) => { + let offset = self.frame().stack_offset; + let value = match &self.stack[offset] { + Value::Function(ups, _) => { + ups[slot].borrow().get(&self.stack) + } + _ => unreachable!(), + }; + self.stack.push(value); + } + + Op::AssignUpvalue(slot) => { + let offset = self.frame().stack_offset; + let value = self.stack.pop().unwrap(); + let slot = match &self.stack[offset] { + Value::Function(ups, _) => Rc::clone(&ups[slot]), + _ => unreachable!(), + }; + slot.borrow_mut().set(&mut self.stack, value); + } + Op::ReadLocal(slot) => { let slot = self.frame().stack_offset + slot; self.stack.push(self.stack[slot].clone()); } - Op::Assign(slot) => { + Op::AssignLocal(slot) => { let slot = self.frame().stack_offset + slot; self.stack[slot] = self.stack.pop().unwrap(); } @@ -439,7 +521,7 @@ impl VM { Op::Call(num_args) => { let new_base = self.stack.len() - 1 - num_args; match &self.stack[new_base] { - Value::Function(block) => { + Value::Function(_, block) => { let args = block.args(); if args.len() != num_args { error!(self, @@ -501,7 +583,7 @@ impl VM { self.stack.clear(); self.frames.clear(); - self.stack.push(Value::Function(Rc::clone(&block))); + self.stack.push(Value::Function(Vec::new(), Rc::clone(&block))); self.frames.push(Frame { stack_offset: 0, @@ -565,7 +647,7 @@ impl VM { Op::Call(num_args) => { let new_base = self.stack.len() - 1 - num_args; match &self.stack[new_base] { - Value::Function(block) => { + Value::Function(_, block) => { let args = block.args(); if args.len() != num_args { error!(self, @@ -612,7 +694,7 @@ impl VM { self.stack.clear(); self.frames.clear(); - self.stack.push(Value::Function(Rc::clone(&block))); + self.stack.push(Value::Function(Vec::new(), Rc::clone(&block))); for arg in block.args() { self.stack.push(arg.as_value()); } -- cgit v1.2.1 From d13695d2452e0468168240800a4cde88f220b646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= Date: Wed, 20 Jan 2021 21:26:14 +0100 Subject: Typecheck upvalues --- src/vm.rs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/vm.rs') diff --git a/src/vm.rs b/src/vm.rs index 7b48b4e..abe7874 100644 --- a/src/vm.rs +++ b/src/vm.rs @@ -152,7 +152,7 @@ pub enum Op { #[derive(Debug)] pub struct Block { pub ty: Type, - pub ups: Vec, + pub ups: Vec<(usize, bool, Type)>, pub name: String, pub file: PathBuf, @@ -521,7 +521,7 @@ impl VM { Op::Call(num_args) => { let new_base = self.stack.len() - 1 - num_args; match &self.stack[new_base] { - Value::Function(_, block) => { + Value::Function(ups, block) => { let args = block.args(); if args.len() != num_args { error!(self, @@ -613,6 +613,19 @@ impl VM { Op::Jmp(_line) => {} + Op::ReadUpvalue(slot) => { + self.stack.push(self.frame().block.ups[slot].2.as_value()); + } + + Op::AssignUpvalue(slot) => { + let var = self.frame().block.ups[slot].2.clone(); + let up = self.stack.pop().unwrap().as_type(); + if var != up { + error!(self, ErrorKind::TypeError(op, vec![var, up]), + "Incorrect type for upvalue.".to_string()); + } + } + Op::Return => { let a = self.stack.pop().unwrap(); let ret = self.frame().block.ret(); @@ -738,6 +751,7 @@ impl VM { let mut errors = Vec::new(); for block in blocks.iter() { + let ups: Vec<_> = block.ups.iter().map(|x| x.2.as_value()).collect(); errors.append(&mut self.typecheck_block(Rc::clone(block))); } -- cgit v1.2.1 From 5d43ce4ab4b9c8d3ca8a0cb21f99b25e87e58fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= 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 From 13cf2875b0e1ae66c7bbb77745225cb01aa2e3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Wed, 20 Jan 2021 23:07:46 +0100 Subject: also truncate in typechecker --- src/vm.rs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/vm.rs') diff --git a/src/vm.rs b/src/vm.rs index cb2285f..c5891f4 100644 --- a/src/vm.rs +++ b/src/vm.rs @@ -706,6 +706,8 @@ impl VM { } self.stack[new_base] = block.ret().as_value(); + + self.stack.truncate(new_base + 1); }, _ => { error!(self, -- cgit v1.2.1 From 9626aa05496a0e745252ba30bf64e8d020c6ec2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Wed, 20 Jan 2021 23:45:47 +0100 Subject: cleanup --- src/vm.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/vm.rs') diff --git a/src/vm.rs b/src/vm.rs index c5891f4..56b87f0 100644 --- a/src/vm.rs +++ b/src/vm.rs @@ -373,7 +373,6 @@ impl VM { 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] { @@ -743,7 +742,7 @@ impl VM { self.frames.push(Frame { stack_offset: 0, - block: block, + block, ip: 0 }); -- cgit v1.2.1 From d261da01634c5fd62cd68f8c9c39a89422bdd398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= Date: Thu, 21 Jan 2021 19:55:22 +0100 Subject: Rc> and closing upvalues --- src/vm.rs | 76 ++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 30 deletions(-) (limited to 'src/vm.rs') diff --git a/src/vm.rs b/src/vm.rs index 56b87f0..3a3e752 100644 --- a/src/vm.rs +++ b/src/vm.rs @@ -1,5 +1,6 @@ use owo_colors::OwoColorize; use std::collections::HashMap; +use std::collections::hash_map::Entry; use std::fmt::Debug; use std::path::{Path, PathBuf}; use std::rc::Rc; @@ -23,7 +24,7 @@ pub enum Value { Int(i64), Bool(bool), String(Rc), - Function(Vec>>, Rc), + Function(Vec>>, Rc>), Unkown, Nil, } @@ -77,7 +78,7 @@ impl Debug for Value { Value::Int(i) => write!(fmt, "(int {})", i), Value::Bool(b) => write!(fmt, "(bool {})", b), Value::String(s) => write!(fmt, "(string \"{}\")", s), - Value::Function(_, block) => write!(fmt, "(fn {}: {:?})", block.name, block.ty), + Value::Function(_, block) => write!(fmt, "(fn {}: {:?})", block.borrow().name, block.borrow().ty), Value::Unkown => write!(fmt, "(unkown)"), Value::Nil => write!(fmt, "(nil)"), } @@ -100,7 +101,7 @@ impl Value { Value::Int(_) => Type::Int, Value::Bool(_) => Type::Bool, Value::String(_) => Type::String, - Value::Function(_, block) => block.ty.clone(), + Value::Function(_, block) => block.borrow().ty.clone(), Value::Unkown => Type::UnknownType, Value::Nil => Type::Void, } @@ -265,7 +266,7 @@ impl Block { #[derive(Debug)] struct Frame { stack_offset: usize, - block: Rc, + block: Rc>, ip: usize, } @@ -305,6 +306,15 @@ impl VM { self } + fn drop_upvalue(&mut self, slot: usize, value: Value) { + if let Entry::Occupied(entry) = self.upvalues.entry(slot) { + entry.get().borrow_mut().close(value); + entry.remove(); + } else { + unreachable!(); + } + } + fn find_upvalue(&mut self, slot: usize) -> &mut Rc> { self.upvalues.entry(slot).or_insert( Rc::new(RefCell::new(UpValue::new(slot)))) @@ -335,17 +345,17 @@ impl VM { &mut self.frames[last] } - fn op(&self) -> &Op { + fn op(&self) -> Op { let ip = self.frame().ip; - &self.frame().block.ops[ip] + self.frame().block.borrow().ops[ip].clone() } fn error(&self, kind: ErrorKind, message: Option) -> Error { let frame = self.frames.last().unwrap(); Error { kind, - file: frame.block.file.clone(), - line: frame.block.line(frame.ip), + file: frame.block.borrow().file.clone(), + line: frame.block.borrow().line(frame.ip), message, } } @@ -365,7 +375,9 @@ impl VM { } Op::PopUpvalue => { - self.stack.pop().unwrap(); + let value = self.stack.pop().unwrap(); + let slot = self.stack.len(); + self.drop_upvalue(slot, value); } Op::Constant(value) => { @@ -373,7 +385,7 @@ impl VM { let value = match value { Value::Function(_, block) => { let mut ups = Vec::new(); - for (slot, is_up, _) in block.ups.iter() { + for (slot, is_up, _) in block.borrow().ups.iter() { let up = if *is_up { if let Value::Function(local_ups, _) = &self.stack[offset] { Rc::clone(&local_ups[*slot]) @@ -543,15 +555,17 @@ impl VM { let new_base = self.stack.len() - 1 - num_args; match &self.stack[new_base] { Value::Function(_, block) => { - let args = block.args(); + let inner = block.borrow(); + let args = inner.args(); if args.len() != num_args { error!(self, ErrorKind::InvalidProgram, format!("Invalid number of arguments, got {} expected {}.", num_args, args.len())); } + if self.print_blocks { - block.debug_print(); + inner.debug_print(); } self.frames.push(Frame { stack_offset: new_base, @@ -596,12 +610,12 @@ impl VM { println!("]"); println!("{:5} {:05} {:?}", - self.frame().block.line(self.frame().ip).red(), + self.frame().block.borrow().line(self.frame().ip).red(), self.frame().ip.blue(), - self.frame().block.ops[self.frame().ip]); + self.frame().block.borrow().ops[self.frame().ip]); } - pub fn run(&mut self, block: Rc) -> Result<(), Error>{ + pub fn run(&mut self, block: Rc>) -> Result<(), Error>{ self.stack.clear(); self.frames.clear(); @@ -615,7 +629,7 @@ impl VM { if self.print_blocks { println!("\n [[{}]]\n", "RUNNING".red()); - self.frame().block.debug_print(); + self.frame().block.borrow().debug_print(); } loop { @@ -623,7 +637,7 @@ impl VM { self.print_stack() } - if matches!(self.eval_op(self.op().clone())?, OpResult::Done) { + if matches!(self.eval_op(self.op())?, OpResult::Done) { return Ok(()); } } @@ -640,11 +654,12 @@ impl VM { } Op::ReadUpvalue(slot) => { - self.stack.push(self.frame().block.ups[slot].2.as_value()); + let value = self.frame().block.borrow().ups[slot].2.as_value(); + self.stack.push(value); } Op::AssignUpvalue(slot) => { - let var = self.frame().block.ups[slot].2.clone(); + let var = self.frame().block.borrow().ups[slot].2.clone(); let up = self.stack.pop().unwrap().as_type(); if var != up { error!(self, ErrorKind::TypeError(op, vec![var, up]), @@ -654,7 +669,8 @@ impl VM { Op::Return => { let a = self.stack.pop().unwrap(); - let ret = self.frame().block.ret(); + let inner = self.frame().block.borrow(); + let ret = inner.ret(); if a.as_type() != *ret { error!(self, ErrorKind::TypeError(op, vec![a.as_type(), ret.clone()]), @@ -685,9 +701,10 @@ impl VM { Op::Call(num_args) => { let new_base = self.stack.len() - 1 - num_args; - match &self.stack[new_base] { + match self.stack[new_base].clone() { Value::Function(_, block) => { - let args = block.args(); + let inner = block.borrow(); + let args = inner.args(); if args.len() != num_args { error!(self, ErrorKind::InvalidProgram, @@ -704,7 +721,7 @@ impl VM { args, stack_args)); } - self.stack[new_base] = block.ret().as_value(); + self.stack[new_base] = block.borrow().ret().as_value(); self.stack.truncate(new_base + 1); }, @@ -731,12 +748,12 @@ impl VM { Ok(()) } - fn typecheck_block(&mut self, block: Rc) -> Vec { + fn typecheck_block(&mut self, block: Rc>) -> Vec { self.stack.clear(); self.frames.clear(); self.stack.push(Value::Function(Vec::new(), Rc::clone(&block))); - for arg in block.args() { + for arg in block.borrow().args() { self.stack.push(arg.as_value()); } @@ -748,13 +765,13 @@ impl VM { if self.print_blocks { println!("\n [[{}]]\n", "TYPECHECK".purple()); - self.frame().block.debug_print(); + self.frame().block.borrow().debug_print(); } let mut errors = Vec::new(); loop { let ip = self.frame().ip; - if ip >= self.frame().block.ops.len() { + if ip >= self.frame().block.borrow().ops.len() { break; } @@ -762,7 +779,7 @@ impl VM { self.print_stack() } - if let Err(e) = self.check_op(self.op().clone()) { + if let Err(e) = self.check_op(self.op()) { errors.push(e); self.frame_mut().ip += 1; } @@ -775,11 +792,10 @@ impl VM { errors } - pub fn typecheck(&mut self, blocks: &Vec>) -> Result<(), Vec> { + pub fn typecheck(&mut self, blocks: &Vec>>) -> Result<(), Vec> { let mut errors = Vec::new(); for block in blocks.iter() { - let ups: Vec<_> = block.ups.iter().map(|x| x.2.as_value()).collect(); errors.append(&mut self.typecheck_block(Rc::clone(block))); } -- cgit v1.2.1 From 18e7483580c000ee512f4a1f266b39c8f206ba65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= Date: Thu, 21 Jan 2021 20:09:00 +0100 Subject: Pop upvalues --- src/vm.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/vm.rs') diff --git a/src/vm.rs b/src/vm.rs index 3a3e752..177c547 100644 --- a/src/vm.rs +++ b/src/vm.rs @@ -590,6 +590,12 @@ impl VM { return Ok(OpResult::Done); } else { self.stack[last.stack_offset] = self.stack.pop().unwrap(); + for slot in last.stack_offset+1..self.stack.len() { + if self.upvalues.contains_key(&slot) { + let value = self.stack[slot].clone(); + self.drop_upvalue(slot, value); + } + } self.stack.truncate(last.stack_offset + 1); } } @@ -653,6 +659,10 @@ impl VM { self.stack.push(value.clone()); } + Op::PopUpvalue => { + self.stack.pop().unwrap(); + } + Op::ReadUpvalue(slot) => { let value = self.frame().block.borrow().ups[slot].2.as_value(); self.stack.push(value); -- cgit v1.2.1 From 4448657f8443842e3ef75353c5fa87dfebb3cffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edvard=20Th=C3=B6rnros?= Date: Thu, 21 Jan 2021 20:56:38 +0100 Subject: Add type inference for upvalues --- src/vm.rs | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) (limited to 'src/vm.rs') diff --git a/src/vm.rs b/src/vm.rs index 177c547..c7b6c0f 100644 --- a/src/vm.rs +++ b/src/vm.rs @@ -655,8 +655,41 @@ impl VM { Op::Jmp(_line) => {} - Op::Constant(value) => { - self.stack.push(value.clone()); + Op::Constant(ref value) => { + match value.clone() { + Value::Function(_, block) => { + self.stack.push(Value::Function(Vec::new(), block.clone())); + + let mut types = Vec::new(); + for (slot, is_up, _) in block.borrow().ups.iter() { + if *is_up { + types.push(Type::Void); + } else { + types.push(self.stack[*slot].as_type()); + } + } + + let mut block_mut = block.borrow_mut(); + for (i, (_, is_up, ty)) in block_mut.ups.iter_mut().enumerate() { + if *is_up { continue; } + + let suggestion = &types[i]; + if ty.is_unkown() { + *ty = suggestion.clone(); + } else { + if ty != suggestion { + error!(self, + ErrorKind::TypeError(op.clone(), + vec![ty.clone(), suggestion.clone()]), + "Failed to infer type.".to_string()); + } + } + }; + }, + _ => { + self.stack.push(value.clone()); + } + } } Op::PopUpvalue => { -- cgit v1.2.1