scott/rudus
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: scott:681176282cdd7da697f1f7e6fdb4d7a80c86924e
Branches Tags
scott:main
scott:bytecode
..
compare: scott:de3d7e834cc33c8aba46e3d03b9dc25516c5105f
Branches Tags
scott:bytecode
scott:main

No commits in common. "681176282cdd7da697f1f7e6fdb4d7a80c86924e" and "de3d7e834cc33c8aba46e3d03b9dc25516c5105f" have entirely different histories.
681176282c ... de3d7e834c

3 changed files with 508 additions and 596 deletions
Show Stats Expand all files Collapse all files

12
src/compiler.rs
View File

@ -286,9 +286,9 @@ fn get_builtin(name: &str, arity: usize) -> Option<Op> {
pub struct Compiler { pub struct Compiler {
pub chunk: Chunk, pub chunk: Chunk,
pub bindings: Vec<Binding>, pub bindings: Vec<Binding>,
pub scope_depth: isize, scope_depth: isize,
pub match_depth: usize, match_depth: usize,
pub stack_depth: usize, stack_depth: usize,
pub spans: Vec<SimpleSpan>, pub spans: Vec<SimpleSpan>,
pub nodes: Vec<&'static Ast>, pub nodes: Vec<&'static Ast>,
pub ast: &'static Ast, pub ast: &'static Ast,
@ -837,8 +837,10 @@ impl Compiler {
// visit all the args // visit all the args
// then store them // then store them
// then call the function // then call the function
for arg in args { for (register_slot, arg) in args.iter().enumerate() {
self.visit(arg); self.visit(arg);
self.emit_op(Op::StoreAt);
self.emit_byte(register_slot);
} }
self.emit_op(Op::PushBinding); self.emit_op(Op::PushBinding);
@ -980,7 +982,7 @@ impl Compiler {
Some(compiler) => compiler, Some(compiler) => compiler,
None => { None => {
let mut compiler = Compiler::new(clause, self.name, self.src); let mut compiler = Compiler::new(clause, self.name, self.src);
// compiler.emit_op(Op::Load); compiler.emit_op(Op::Load);
compiler.stack_depth += arity; compiler.stack_depth += arity;
compiler.scope_depth += 1; compiler.scope_depth += 1;
compiler.emit_op(Op::ResetMatch); compiler.emit_op(Op::ResetMatch);

30
src/main.rs
View File

@ -57,30 +57,26 @@ pub fn run(src: &'static str) {
println!("\n\n") println!("\n\n")
} }
if DEBUG_RUN { // if DEBUG_RUN {
println!("=== vm run: test ==="); // println!("=== vm run: test ===");
} // }
// TODO: investigate lifeteims and remove this clone // let mut vm = Vm::new(&compiler.chunk);
let show_chunk = compiler.chunk.clone(); // let result = vm.run();
let vm_chunk = compiler.chunk; // let output = match result {
// Ok(val) => val.show(&compiler.chunk),
let mut vm = Vm::new(vm_chunk); // Err(panic) => format!("Ludus panicked! {panic}"),
let result = vm.run(); // };
let output = match result { // vm.print_stack();
Ok(val) => val.show(&show_chunk), // println!("{output}");
Err(panic) => format!("Ludus panicked! {panic}"),
};
vm.print_stack();
println!("{output}");
} }
pub fn main() { pub fn main() {
env::set_var("RUST_BACKTRACE", "1"); env::set_var("RUST_BACKTRACE", "1");
let src = " let src = "
fn foo (_) -> [1, 2, 3] fn foo () -> :bar
foo (1) foo ()
"; ";
run(src); run(src);
} }

282
src/vm.rs
View File

@ -1,11 +1,10 @@
use crate::compiler::{Chunk, Op}; use crate::compiler::{Chunk, Op};
use crate::parser::Ast; use crate::parser::Ast;
use crate::spans::Spanned; use crate::spans::Spanned;
use crate::value::{LFn, Value}; use crate::value::Value;
use chumsky::prelude::SimpleSpan; use chumsky::prelude::SimpleSpan;
use imbl::{HashMap, Vector}; use imbl::{HashMap, Vector};
use num_traits::FromPrimitive; use num_traits::FromPrimitive;
use std::cell::OnceCell;
use std::cell::RefCell; use std::cell::RefCell;
use std::fmt; use std::fmt;
use std::mem::swap; use std::mem::swap;
@ -44,44 +43,9 @@ pub struct Trace {
pub src: &'static str, pub src: &'static str,
} }
pub struct CallFrame { pub struct Vm<'a> {
pub function: Value,
pub arity: u8,
pub stack_base: usize,
pub ip: usize,
}
impl CallFrame {
pub fn chunk(&self) -> &Chunk {
let Value::Fn(ref function) = self.function else {
unreachable!()
};
&function
.get()
.unwrap()
.chunks
.iter()
.find(|(arity, _)| *arity == self.arity)
.unwrap()
.1
}
}
impl fmt::Display for CallFrame {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let Value::Fn(ref function) = self.function else {
unreachable!()
};
let inner_fn = function.get().unwrap();
let name = inner_fn.name;
write!(f, "CallFrame: {name}/{} @ {}", self.arity, self.ip)
}
}
pub struct Vm {
pub stack: Vec<Value>, pub stack: Vec<Value>,
pub call_stack: Vec<CallFrame>, pub chunk: &'a Chunk,
pub frame: CallFrame,
pub ip: usize, pub ip: usize,
pub return_register: [Value; 7], pub return_register: [Value; 7],
pub matches: bool, pub matches: bool,
@ -89,39 +53,27 @@ pub struct Vm {
pub result: Option<Result<Value, Panic>>, pub result: Option<Result<Value, Panic>>,
} }
impl Vm { impl<'a> Vm<'a> {
pub fn new(chunk: Chunk) -> Vm { pub fn new(chunk: &'a Chunk) -> Vm<'a> {
let cell = OnceCell::new();
let lfn = LFn {
name: "user script",
doc: None,
chunks: vec![(0, chunk)],
closed: vec![],
};
let _ = cell.set(lfn);
let base_fn = Value::Fn(Rc::new(cell));
let base_frame = CallFrame {
function: base_fn.clone(),
stack_base: 0,
ip: 0,
arity: 0,
};
Vm { Vm {
chunk,
stack: vec![], stack: vec![],
call_stack: Vec::with_capacity(64),
frame: base_frame,
ip: 0, ip: 0,
return_register: [const { Value::Nothing }; 7], return_register: [
Value::Nothing,
Value::Nothing,
Value::Nothing,
Value::Nothing,
Value::Nothing,
Value::Nothing,
Value::Nothing,
],
matches: false, matches: false,
match_depth: 0, match_depth: 0,
result: None, result: None,
} }
} }
pub fn chunk(&self) -> &Chunk {
self.frame.chunk()
}
pub fn push(&mut self, value: Value) { pub fn push(&mut self, value: Value) {
self.stack.push(value); self.stack.push(value);
} }
@ -153,7 +105,7 @@ impl Vm {
fn print_debug(&self) { fn print_debug(&self) {
self.print_stack(); self.print_stack();
let mut ip = self.ip; let mut ip = self.ip;
self.chunk().dissasemble_instr(&mut ip); self.chunk.dissasemble_instr(&mut ip);
} }
pub fn run(&mut self) -> &Result<Value, Panic> { pub fn run(&mut self) -> &Result<Value, Panic> {
@ -172,8 +124,7 @@ impl Vm {
} }
pub fn interpret(&mut self) { pub fn interpret(&mut self) {
loop { let Some(byte) = self.chunk.bytecode.get(self.ip) else {
let Some(byte) = self.chunk().bytecode.get(self.ip) else {
self.result = Some(Ok(self.stack.pop().unwrap())); self.result = Some(Ok(self.stack.pop().unwrap()));
return; return;
}; };
@ -199,21 +150,21 @@ impl Vm {
self.ip += 1; self.ip += 1;
} }
Constant => { Constant => {
let const_idx = self.chunk().bytecode[self.ip + 1]; let const_idx = self.chunk.bytecode[self.ip + 1];
let value = self.chunk().constants[const_idx as usize].clone(); let value = self.chunk.constants[const_idx as usize].clone();
self.push(value); self.push(value);
self.ip += 2; self.ip += 2;
} }
Jump => { Jump => {
let jump_len = self.chunk().bytecode[self.ip + 1]; let jump_len = self.chunk.bytecode[self.ip + 1];
self.ip += jump_len as usize + 2; self.ip += jump_len as usize + 2;
} }
JumpBack => { JumpBack => {
let jump_len = self.chunk().bytecode[self.ip + 1]; let jump_len = self.chunk.bytecode[self.ip + 1];
self.ip -= jump_len as usize; self.ip -= jump_len as usize;
} }
JumpIfFalse => { JumpIfFalse => {
let jump_len = self.chunk().bytecode[self.ip + 1]; let jump_len = self.chunk.bytecode[self.ip + 1];
let cond = self.pop(); let cond = self.pop();
match cond { match cond {
Value::Nil | Value::False => { Value::Nil | Value::False => {
@ -225,7 +176,7 @@ impl Vm {
} }
} }
JumpIfTrue => { JumpIfTrue => {
let jump_len = self.chunk().bytecode[self.ip + 1]; let jump_len = self.chunk.bytecode[self.ip + 1];
let cond = self.pop(); let cond = self.pop();
match cond { match cond {
Value::Nil | Value::False => { Value::Nil | Value::False => {
@ -237,16 +188,18 @@ impl Vm {
} }
} }
JumpIfZero => { JumpIfZero => {
let jump_len = self.chunk().bytecode[self.ip + 1]; let jump_len = self.chunk.bytecode[self.ip + 1];
let cond = self.pop(); let cond = self.pop();
match cond { match cond {
Value::Number(x) if x <= 0.0 => { Value::Number(0.0) => {
self.ip += jump_len as usize + 2; self.ip += jump_len as usize + 2;
self.interpret()
} }
Value::Number(..) => { Value::Number(..) => {
self.ip += 2; self.ip += 2;
self.interpret()
} }
_ => return self.panic("repeat requires a number"), _ => self.panic("repeat requires a number"),
} }
} }
Pop => { Pop => {
@ -254,13 +207,12 @@ impl Vm {
self.ip += 1; self.ip += 1;
} }
PopN => { PopN => {
let n = self.chunk().bytecode[self.ip + 1] as usize; let n = self.chunk.bytecode[self.ip + 1] as usize;
self.stack.truncate(self.stack.len() - n); self.stack.truncate(self.stack.len() - n);
self.ip += 2; self.ip += 2;
} }
PushBinding => { PushBinding => {
let binding_idx = let binding_idx = self.chunk.bytecode[self.ip + 1] as usize;
self.chunk().bytecode[self.ip + 1] as usize + self.frame.stack_base;
let binding_value = self.stack[binding_idx].clone(); let binding_value = self.stack[binding_idx].clone();
self.push(binding_value); self.push(binding_value);
self.ip += 2; self.ip += 2;
@ -271,7 +223,7 @@ impl Vm {
self.ip += 1; self.ip += 1;
} }
StoreAt => { StoreAt => {
let i = self.chunk().bytecode[self.ip + 1] as usize; let i = self.chunk.bytecode[self.ip + 1] as usize;
self.return_register[i] = self.pop(); self.return_register[i] = self.pop();
self.ip += 2; self.ip += 2;
} }
@ -302,9 +254,10 @@ impl Vm {
let as_type = self.pop(); let as_type = self.pop();
let idx = self.stack.len() - self.match_depth as usize - 1; let idx = self.stack.len() - self.match_depth as usize - 1;
let val_type = self.stack[idx].type_of(); let val_type = self.stack[idx].type_of();
let val_type = self.chunk().kw_from(val_type).unwrap(); let val_type = self.chunk.kw_from(val_type).unwrap();
self.matches = val_type == as_type; self.matches = val_type == as_type;
self.ip += 1; self.ip += 1;
self.interpret()
} }
MatchNil => { MatchNil => {
let idx = self.stack.len() - self.match_depth as usize - 1; let idx = self.stack.len() - self.match_depth as usize - 1;
@ -312,6 +265,7 @@ impl Vm {
self.matches = true; self.matches = true;
}; };
self.ip += 1; self.ip += 1;
self.interpret()
} }
MatchTrue => { MatchTrue => {
let idx = self.stack.len() - self.match_depth as usize - 1; let idx = self.stack.len() - self.match_depth as usize - 1;
@ -329,20 +283,20 @@ impl Vm {
} }
PanicIfNoMatch => { PanicIfNoMatch => {
if !self.matches { if !self.matches {
return self.panic("no match"); self.panic("no match");
} else { } else {
self.ip += 1; self.ip += 1;
} }
} }
MatchConstant => { MatchConstant => {
let const_idx = self.chunk().bytecode[self.ip + 1]; let const_idx = self.chunk.bytecode[self.ip + 1];
let idx = self.stack.len() - self.match_depth as usize - 1; let idx = self.stack.len() - self.match_depth as usize - 1;
self.matches = self.stack[idx] == self.chunk().constants[const_idx as usize]; self.matches = self.stack[idx] == self.chunk.constants[const_idx as usize];
self.ip += 2; self.ip += 2;
} }
MatchTuple => { MatchTuple => {
let idx = self.stack.len() - self.match_depth as usize - 1; let idx = self.stack.len() - self.match_depth as usize - 1;
let tuple_len = self.chunk().bytecode[self.ip + 1]; let tuple_len = self.chunk.bytecode[self.ip + 1];
let scrutinee = self.stack[idx].clone(); let scrutinee = self.stack[idx].clone();
match scrutinee { match scrutinee {
Value::Tuple(members) => self.matches = members.len() == tuple_len as usize, Value::Tuple(members) => self.matches = members.len() == tuple_len as usize,
@ -351,10 +305,10 @@ impl Vm {
self.ip += 2; self.ip += 2;
} }
PushTuple => { PushTuple => {
let tuple_len = self.chunk().bytecode[self.ip + 1]; let tuple_len = self.chunk.bytecode[self.ip + 1];
let tuple_members = self.stack.split_off(self.stack.len() - tuple_len as usize); let tuple_members = self.stack.split_off(self.stack.len() - tuple_len as usize);
let tuple = Value::Tuple(Rc::new(tuple_members)); let tuple = Value::Tuple(Rc::new(tuple_members));
self.push(tuple); self.stack.push(tuple);
self.ip += 2; self.ip += 2;
} }
LoadTuple => { LoadTuple => {
@ -366,20 +320,20 @@ impl Vm {
self.push(member.clone()); self.push(member.clone());
} }
} }
_ => return self.panic("internal error: expected tuple"), _ => self.panic("internal error: expected tuple"),
}; };
self.ip += 1; self.ip += 1;
} }
PushList => { PushList => {
let list_len = self.chunk().bytecode[self.ip + 1]; let list_len = self.chunk.bytecode[self.ip + 1];
let list_members = self.stack.split_off(self.stack.len() - list_len as usize); let list_members = self.stack.split_off(self.stack.len() - list_len as usize);
let list = Value::List(Box::new(Vector::from(list_members))); let list = Value::List(Box::new(Vector::from(list_members)));
self.push(list); self.stack.push(list);
self.ip += 2; self.ip += 2;
} }
MatchList => { MatchList => {
let idx = self.stack.len() - self.match_depth as usize - 1; let idx = self.stack.len() - self.match_depth as usize - 1;
let tuple_len = self.chunk().bytecode[self.ip + 1]; let tuple_len = self.chunk.bytecode[self.ip + 1];
let scrutinee = self.stack[idx].clone(); let scrutinee = self.stack[idx].clone();
match scrutinee { match scrutinee {
Value::List(members) => self.matches = members.len() == tuple_len as usize, Value::List(members) => self.matches = members.len() == tuple_len as usize,
@ -396,12 +350,12 @@ impl Vm {
self.push(member.clone()); self.push(member.clone());
} }
} }
_ => return self.panic("internal error: expected tuple"), _ => self.panic("internal error: expected tuple"),
}; };
self.ip += 1; self.ip += 1;
} }
PushDict => { PushDict => {
let dict_len = self.chunk().bytecode[self.ip + 1] as usize * 2; let dict_len = self.chunk.bytecode[self.ip + 1] as usize * 2;
let dict_members = self.stack.split_off(self.stack.len() - dict_len); let dict_members = self.stack.split_off(self.stack.len() - dict_len);
let mut dict = HashMap::new(); let mut dict = HashMap::new();
let mut dict_iter = dict_members.iter(); let mut dict_iter = dict_members.iter();
@ -412,11 +366,11 @@ impl Vm {
let value = dict_iter.next().unwrap(); let value = dict_iter.next().unwrap();
dict.insert(*key, value.clone()); dict.insert(*key, value.clone());
} }
self.push(Value::Dict(Box::new(dict))); self.stack.push(Value::Dict(Box::new(dict)));
self.ip += 2; self.ip += 2;
} }
LoadDictValue => { LoadDictValue => {
let dict_idx = self.chunk().bytecode[self.ip + 1] as usize; let dict_idx = self.chunk.bytecode[self.ip + 1] as usize;
let Value::Dict(dict) = self.stack[dict_idx].clone() else { let Value::Dict(dict) = self.stack[dict_idx].clone() else {
unreachable!("expected dict, got something else") unreachable!("expected dict, got something else")
}; };
@ -429,7 +383,7 @@ impl Vm {
} }
MatchDict => { MatchDict => {
let idx = self.stack.len() - self.match_depth as usize - 1; let idx = self.stack.len() - self.match_depth as usize - 1;
let dict_len = self.chunk().bytecode[self.ip + 1]; let dict_len = self.chunk.bytecode[self.ip + 1];
let scrutinee = self.stack[idx].clone(); let scrutinee = self.stack[idx].clone();
match scrutinee { match scrutinee {
Value::Dict(members) => self.matches = members.len() == dict_len as usize, Value::Dict(members) => self.matches = members.len() == dict_len as usize,
@ -439,7 +393,7 @@ impl Vm {
} }
PushBox => { PushBox => {
let val = self.pop(); let val = self.pop();
self.push(Value::Box(Rc::new(RefCell::new(val)))); self.stack.push(Value::Box(Rc::new(RefCell::new(val))));
self.ip += 1; self.ip += 1;
} }
GetKey => { GetKey => {
@ -456,7 +410,7 @@ impl Vm {
self.ip += 1; self.ip += 1;
} }
JumpIfNoMatch => { JumpIfNoMatch => {
let jump_len = self.chunk().bytecode[self.ip + 1] as usize; let jump_len = self.chunk.bytecode[self.ip + 1] as usize;
if !self.matches { if !self.matches {
self.ip += jump_len + 2; self.ip += jump_len + 2;
} else { } else {
@ -464,7 +418,7 @@ impl Vm {
} }
} }
JumpIfMatch => { JumpIfMatch => {
let jump_len = self.chunk().bytecode[self.ip + 1] as usize; let jump_len = self.chunk.bytecode[self.ip + 1] as usize;
if self.matches { if self.matches {
self.ip += jump_len + 2; self.ip += jump_len + 2;
} else { } else {
@ -473,7 +427,7 @@ impl Vm {
} }
TypeOf => { TypeOf => {
let val = self.pop(); let val = self.pop();
let type_of = self.chunk().kw_from(val.type_of()).unwrap(); let type_of = self.chunk.kw_from(val.type_of()).unwrap();
self.push(type_of); self.push(type_of);
self.ip += 1; self.ip += 1;
} }
@ -483,7 +437,7 @@ impl Vm {
self.push(Value::Number(x as usize as f64)); self.push(Value::Number(x as usize as f64));
self.ip += 1; self.ip += 1;
} else { } else {
return self.panic("repeat requires a number"); self.panic("repeat requires a number");
} }
} }
Decrement => { Decrement => {
@ -491,93 +445,95 @@ impl Vm {
if let Value::Number(x) = val { if let Value::Number(x) = val {
self.push(Value::Number(x - 1.0)); self.push(Value::Number(x - 1.0));
self.ip += 1; self.ip += 1;
self.interpret()
} else { } else {
return self.panic("you may only decrement a number"); self.panic("you may only decrement a number");
} }
} }
Duplicate => { Duplicate => {
self.push(self.peek().clone()); self.push(self.peek().clone());
self.ip += 1; self.ip += 1;
self.interpret()
} }
MatchDepth => { MatchDepth => {
self.match_depth = self.chunk().bytecode[self.ip + 1]; self.match_depth = self.chunk.bytecode[self.ip + 1];
self.ip += 2; self.ip += 2;
self.interpret()
} }
PanicNoWhen | PanicNoMatch => { PanicNoWhen | PanicNoMatch => self.panic("no match"),
return self.panic("no match");
}
Eq => { Eq => {
let first = self.pop(); let first = self.stack.pop().unwrap();
let second = self.pop(); let second = self.stack.pop().unwrap();
if first == second { if first == second {
self.push(Value::True) self.stack.push(Value::True)
} else { } else {
self.push(Value::False) self.stack.push(Value::False)
} }
self.ip += 1; self.ip += 1;
} }
Add => { Add => {
let first = self.pop(); let first = self.stack.pop().unwrap();
let second = self.pop(); let second = self.stack.pop().unwrap();
if let (Value::Number(x), Value::Number(y)) = (first, second) { if let (Value::Number(x), Value::Number(y)) = (first, second) {
self.push(Value::Number(x + y)) self.stack.push(Value::Number(x + y))
} else { } else {
return self.panic("`add` requires two numbers"); self.panic("`add` requires two numbers")
} }
self.ip += 1; self.ip += 1;
} }
Sub => { Sub => {
let first = self.pop(); let first = self.stack.pop().unwrap();
let second = self.pop(); let second = self.stack.pop().unwrap();
if let (Value::Number(x), Value::Number(y)) = (first, second) { if let (Value::Number(x), Value::Number(y)) = (first, second) {
self.push(Value::Number(y - x)) self.stack.push(Value::Number(y - x))
} else { } else {
return self.panic("`sub` requires two numbers"); self.panic("`sub` requires two numbers")
} }
self.ip += 1; self.ip += 1;
} }
Mult => { Mult => {
let first = self.pop(); let first = self.stack.pop().unwrap();
let second = self.pop(); let second = self.stack.pop().unwrap();
if let (Value::Number(x), Value::Number(y)) = (first, second) { if let (Value::Number(x), Value::Number(y)) = (first, second) {
self.push(Value::Number(x * y)) self.stack.push(Value::Number(x * y))
} else { } else {
return self.panic("`mult` requires two numbers"); self.panic("`mult` requires two numbers")
} }
self.ip += 1; self.ip += 1;
} }
Div => { Div => {
let first = self.pop(); let first = self.stack.pop().unwrap();
let second = self.pop(); let second = self.stack.pop().unwrap();
if let (Value::Number(x), Value::Number(y)) = (first, second) { if let (Value::Number(x), Value::Number(y)) = (first, second) {
if x == 0.0 { if x == 0.0 {
return self.panic("division by 0"); self.panic("division by 0")
} }
self.push(Value::Number(y / x)) self.stack.push(Value::Number(y / x))
} else { } else {
return self.panic("`div` requires two numbers"); self.panic("`div` requires two numbers")
} }
self.ip += 1; self.ip += 1;
} }
Unbox => { Unbox => {
let the_box = self.pop(); let the_box = self.stack.pop().unwrap();
let inner = if let Value::Box(b) = the_box { let inner = if let Value::Box(b) = the_box {
b.borrow().clone() b.borrow().clone()
} else { } else {
return self.panic("`unbox` requires a box"); return self.panic("`unbox` requires a box");
}; };
self.push(inner); self.stack.push(inner);
self.ip += 1; self.ip += 1;
} }
BoxStore => { BoxStore => {
let new_value = self.pop(); let new_value = self.stack.pop().unwrap();
let the_box = self.pop(); let the_box = self.stack.pop().unwrap();
if let Value::Box(b) = the_box { if let Value::Box(b) = the_box {
b.replace(new_value.clone()); b.replace(new_value.clone());
} else { } else {
return self.panic("`store` requires a box"); return self.panic("`store` requires a box");
} }
self.push(new_value); self.stack.push(new_value);
self.ip += 1; self.ip += 1;
} }
Assert => { Assert => {
@ -588,8 +544,8 @@ impl Vm {
self.ip += 1; self.ip += 1;
} }
Get => { Get => {
let key = self.pop(); let key = self.stack.pop().unwrap();
let dict = self.pop(); let dict = self.stack.pop().unwrap();
let value = match (key, dict) { let value = match (key, dict) {
(Value::Keyword(k), Value::Dict(d)) => { (Value::Keyword(k), Value::Dict(d)) => {
d.as_ref().get(&k).unwrap_or(&Value::Nil).clone() d.as_ref().get(&k).unwrap_or(&Value::Nil).clone()
@ -597,12 +553,12 @@ impl Vm {
(Value::Keyword(_), _) => Value::Nil, (Value::Keyword(_), _) => Value::Nil,
_ => return self.panic("keys must be keywords"), _ => return self.panic("keys must be keywords"),
}; };
self.push(value); self.stack.push(value);
self.ip += 1; self.ip += 1;
} }
At => { At => {
let idx = self.pop(); let idx = self.stack.pop().unwrap();
let ordered = self.pop(); let ordered = self.stack.pop().unwrap();
let value = match (ordered, idx) { let value = match (ordered, idx) {
(Value::List(l), Value::Number(i)) => { (Value::List(l), Value::Number(i)) => {
l.get(i as usize).unwrap_or(&Value::Nil).clone() l.get(i as usize).unwrap_or(&Value::Nil).clone()
@ -613,7 +569,7 @@ impl Vm {
(_, Value::Number(_)) => Value::Nil, (_, Value::Number(_)) => Value::Nil,
_ => return self.panic("indexes must be numbers"), _ => return self.panic("indexes must be numbers"),
}; };
self.push(value); self.stack.push(value);
self.ip += 1; self.ip += 1;
} }
Not => { Not => {
@ -626,8 +582,8 @@ impl Vm {
self.ip += 1; self.ip += 1;
} }
Panic => { Panic => {
let msg = self.pop().show(self.chunk()); let msg = self.pop().show(self.chunk);
return self.panic_with(msg); self.panic_with(msg);
} }
EmptyString => { EmptyString => {
self.push(Value::String(Rc::new("".to_string()))); self.push(Value::String(Rc::new("".to_string())));
@ -650,55 +606,13 @@ impl Vm {
} }
Stringify => { Stringify => {
let to_stringify = self.pop(); let to_stringify = self.pop();
let the_string = to_stringify.stringify(self.chunk()); let the_string = to_stringify.stringify(self.chunk);
let stringified = Value::String(Rc::new(the_string)); let stringified = Value::String(Rc::new(the_string));
self.push(stringified); self.push(stringified);
self.ip += 1; self.ip += 1;
} }
Call => { Call => todo!(),
let arity = self.chunk().bytecode[self.ip + 1]; Return => todo!(),
self.ip += 2;
let val = self.pop();
let Value::Fn(_) = val else {
return self
.panic_with(format!("{} is not a function", val.show(self.chunk())));
};
let mut frame = CallFrame {
function: val,
arity,
stack_base: self.stack.len() - arity as usize,
ip: 0,
};
swap(&mut self.frame, &mut frame);
frame.ip = self.ip;
self.call_stack.push(frame);
self.ip = 0;
if crate::DEBUG_RUN {
println!(
"== calling into {} ==",
self.frame.function.show(self.chunk())
);
}
}
Return => {
if crate::DEBUG_RUN {
println!(
"== returning from {} ==",
self.frame.function.show(self.chunk())
)
}
self.frame = self.call_stack.pop().unwrap();
self.ip = self.frame.ip;
let mut value = Value::Nothing;
swap(&mut self.return_register[0], &mut value);
self.push(value);
}
}
} }
} }
} }