freya/matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fn call fix

Browse source
This commit is contained in:
Freya Murphy 2024-02-23 16:38:26 -05:00
parent 1ebe51c7b3
commit ad8700371f
Signed by: freya
GPG key ID: 744AB800E383AE52
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
matrix/src/parse.rs
View file

@ -223,7 +223,7 @@ impl Parser {
self.force_token(T::RightBrack)?; self.force_token(T::RightBrack)?;
expr expr
}, },
T::Ident(ident) => E::Ident(ident), T::Ident(ident) => E::Literal(V::String(ident.to_string().into())),
T::String(string) => E::Literal(V::String(string.to_string().into())), T::String(string) => E::Literal(V::String(string.to_string().into())),
_ => return Err(Error::UnexpectedToken(tok).into()) _ => return Err(Error::UnexpectedToken(tok).into())
}) })

3
matrix/src/vm.rs
View file

@ -181,6 +181,8 @@ impl Vm {
pub fn run(&mut self, fun: Rc<Function>) -> Result<Value> { pub fn run(&mut self, fun: Rc<Function>) -> Result<Value> {
let mut frame = self.init_frame(fun)?; let mut frame = self.init_frame(fun)?;
self.interupt.store(0, Ordering::SeqCst); self.interupt.store(0, Ordering::SeqCst);
self.stack = Stack::new();
self.locals = Stack::new();
loop { loop {
use Instruction::*; use Instruction::*;
@ -303,6 +305,7 @@ impl Vm {
}; };
let ret = self.pop(); let ret = self.pop();
self.stack.truncate(frame.bp); self.stack.truncate(frame.bp);
self.locals.truncate(0);
self.push(ret); self.push(ret);
frame = prev_frame; frame = prev_frame;
}, },