Compare commits
No commits in common. "6c803cdf5ad5bacbf88829a963dd81221fa0d27c" and "8908630a21300f8fb1daafdb135ecfae1d7ab43d" have entirely different histories.
6c803cdf5a
...
8908630a21
|
|
@ -41,7 +41,6 @@ pub enum Op {
|
|||
Duplicate,
|
||||
Decrement,
|
||||
Truncate,
|
||||
MatchDepth,
|
||||
}
|
||||
|
||||
impl std::fmt::Display for Op {
|
||||
|
|
@ -80,7 +79,6 @@ impl std::fmt::Display for Op {
|
|||
Decrement => "decrement",
|
||||
Truncate => "truncate",
|
||||
Duplicate => "duplicate",
|
||||
MatchDepth => "match_depth",
|
||||
};
|
||||
write!(f, "{rep}")
|
||||
}
|
||||
|
|
@ -116,7 +114,7 @@ impl Chunk {
|
|||
println!("{i:04}: {:16} {next:04}: {value}", op.to_string());
|
||||
}
|
||||
PushBinding | MatchTuple | PushTuple | PushDict | PushList | PushBox | Jump
|
||||
| JumpIfFalse | JumpIfNoMatch | JumpBack | JumpIfZero | MatchDepth => {
|
||||
| JumpIfFalse | JumpIfNoMatch | JumpBack | JumpIfZero => {
|
||||
let next = self.bytecode[i + 1];
|
||||
println!("{i:04}: {:16} {next:04}", op.to_string());
|
||||
}
|
||||
|
|
@ -627,16 +625,6 @@ impl Compiler {
|
|||
let (Ast::TuplePattern(members), _) = pattern.as_ref() else {
|
||||
unreachable!()
|
||||
};
|
||||
// TODO: finish compiling match clauses
|
||||
// I just added "match depth" to the VM
|
||||
// this will set match depth to artiy
|
||||
// and decrement it each pattern
|
||||
// the compiler will need to know about match depth for binding to work
|
||||
// we should match against ALL args first
|
||||
// rather than jump_no_matching after every arg check
|
||||
// compile the body
|
||||
// and then jump_no_match to the next clause
|
||||
// at the end, panic_no_match
|
||||
}
|
||||
//match against the values on the stack
|
||||
//we know the (fixed) arity, so we should know where to look
|
||||
|
|
@ -678,7 +666,7 @@ impl Compiler {
|
|||
println!("{i:04}: {:16} {next:04}: {value}", op.to_string());
|
||||
}
|
||||
PushBinding | MatchTuple | PushTuple | PushDict | PushList | PushBox | Jump
|
||||
| JumpIfFalse | JumpIfNoMatch | JumpBack | JumpIfZero | MatchDepth => {
|
||||
| JumpIfFalse | JumpIfNoMatch | JumpBack | JumpIfZero => {
|
||||
let (_, next) = codes.next().unwrap();
|
||||
println!("{i:04}: {:16} {next:04}", op.to_string());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ pub fn run(src: &'static str) {
|
|||
}
|
||||
|
||||
let mut vm = Vm::new(&compiler.chunk);
|
||||
let result = vm.run();
|
||||
let result = vm.interpret();
|
||||
let output = match result {
|
||||
Ok(val) => val.show(&compiler.chunk),
|
||||
Err(panic) => format!("{:?}", panic),
|
||||
|
|
|
|||
59
src/vm.rs
59
src/vm.rs
|
|
@ -37,7 +37,6 @@ pub struct Vm<'a> {
|
|||
pub return_register: Value,
|
||||
pub matches: bool,
|
||||
pub match_depth: u8,
|
||||
pub result: Option<Result<Value, Panic>>,
|
||||
}
|
||||
|
||||
impl<'a> Vm<'a> {
|
||||
|
|
@ -49,7 +48,6 @@ impl<'a> Vm<'a> {
|
|||
return_register: Value::Nil,
|
||||
matches: false,
|
||||
match_depth: 0,
|
||||
result: None,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -80,21 +78,9 @@ impl<'a> Vm<'a> {
|
|||
self.chunk.dissasemble_instr(self.ip);
|
||||
}
|
||||
|
||||
pub fn run(&mut self) -> &Result<Value, Panic> {
|
||||
while self.result.is_none() {
|
||||
self.interpret();
|
||||
}
|
||||
self.result.as_ref().unwrap()
|
||||
}
|
||||
|
||||
pub fn panic(&mut self, msg: &'static str) {
|
||||
self.result = Some(Err(Panic(msg)));
|
||||
}
|
||||
|
||||
pub fn interpret(&mut self) {
|
||||
pub fn interpret(&mut self) -> Result<Value, Panic> {
|
||||
let Some(byte) = self.chunk.bytecode.get(self.ip) else {
|
||||
self.result = Some(Ok(self.stack.pop().unwrap()));
|
||||
return;
|
||||
return Ok(self.stack.pop().unwrap());
|
||||
};
|
||||
if crate::DEBUG_RUN {
|
||||
self.print_debug();
|
||||
|
|
@ -105,28 +91,34 @@ impl<'a> Vm<'a> {
|
|||
Nil => {
|
||||
self.push(Value::Nil);
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
True => {
|
||||
self.push(Value::True);
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
False => {
|
||||
self.push(Value::False);
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
Constant => {
|
||||
let const_idx = self.chunk.bytecode[self.ip + 1];
|
||||
let value = self.chunk.constants[const_idx as usize].clone();
|
||||
self.push(value);
|
||||
self.ip += 2;
|
||||
self.interpret()
|
||||
}
|
||||
Jump => {
|
||||
let jump_len = self.chunk.bytecode[self.ip + 1];
|
||||
self.ip += jump_len as usize + 2;
|
||||
self.interpret()
|
||||
}
|
||||
JumpBack => {
|
||||
let jump_len = self.chunk.bytecode[self.ip + 1];
|
||||
self.ip -= jump_len as usize;
|
||||
self.interpret()
|
||||
}
|
||||
JumpIfFalse => {
|
||||
let jump_len = self.chunk.bytecode[self.ip + 1];
|
||||
|
|
@ -134,9 +126,11 @@ impl<'a> Vm<'a> {
|
|||
match cond {
|
||||
Value::Nil | Value::False => {
|
||||
self.ip += jump_len as usize + 2;
|
||||
self.interpret()
|
||||
}
|
||||
_ => {
|
||||
self.ip += 2;
|
||||
self.interpret()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -152,38 +146,44 @@ impl<'a> Vm<'a> {
|
|||
self.ip += 2;
|
||||
self.interpret()
|
||||
}
|
||||
_ => self.panic("repeat requires a number"),
|
||||
_ => Err(Panic("repeat requires a number")),
|
||||
}
|
||||
}
|
||||
Pop => {
|
||||
self.pop();
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
PushBinding => {
|
||||
let binding_idx = self.chunk.bytecode[self.ip + 1] as usize;
|
||||
let binding_value = self.stack[binding_idx].clone();
|
||||
self.push(binding_value);
|
||||
self.ip += 2;
|
||||
self.interpret()
|
||||
}
|
||||
Store => {
|
||||
self.return_register = self.pop();
|
||||
self.push(Value::Nil);
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
Load => {
|
||||
let mut value = Value::Nil;
|
||||
swap(&mut self.return_register, &mut value);
|
||||
self.push(value);
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
ResetMatch => {
|
||||
self.matches = false;
|
||||
self.match_depth = 0;
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
MatchWord => {
|
||||
self.matches = true;
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
MatchNil => {
|
||||
let idx = self.stack.len() - self.match_depth as usize - 1;
|
||||
|
|
@ -199,6 +199,7 @@ impl<'a> Vm<'a> {
|
|||
self.matches = true;
|
||||
};
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
MatchFalse => {
|
||||
let idx = self.stack.len() - self.match_depth as usize - 1;
|
||||
|
|
@ -206,12 +207,14 @@ impl<'a> Vm<'a> {
|
|||
self.matches = true;
|
||||
}
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
PanicIfNoMatch => {
|
||||
if !self.matches {
|
||||
self.panic("no match");
|
||||
Err(Panic("no match"))
|
||||
} else {
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
}
|
||||
MatchConstant => {
|
||||
|
|
@ -219,6 +222,7 @@ impl<'a> Vm<'a> {
|
|||
let idx = self.stack.len() - self.match_depth as usize - 1;
|
||||
self.matches = self.stack[idx] == self.chunk.constants[const_idx as usize];
|
||||
self.ip += 2;
|
||||
self.interpret()
|
||||
}
|
||||
PushTuple => {
|
||||
let tuple_len = self.chunk.bytecode[self.ip + 1];
|
||||
|
|
@ -226,6 +230,7 @@ impl<'a> Vm<'a> {
|
|||
let tuple = Value::Tuple(Rc::new(tuple_members));
|
||||
self.stack.push(tuple);
|
||||
self.ip += 2;
|
||||
self.interpret()
|
||||
}
|
||||
PushList => {
|
||||
let list_len = self.chunk.bytecode[self.ip + 1];
|
||||
|
|
@ -233,6 +238,7 @@ impl<'a> Vm<'a> {
|
|||
let list = Value::List(Box::new(Vector::from(list_members)));
|
||||
self.stack.push(list);
|
||||
self.ip += 2;
|
||||
self.interpret()
|
||||
}
|
||||
PushDict => {
|
||||
let dict_len = self.chunk.bytecode[self.ip + 1] as usize * 2;
|
||||
|
|
@ -248,11 +254,13 @@ impl<'a> Vm<'a> {
|
|||
}
|
||||
self.stack.push(Value::Dict(Box::new(dict)));
|
||||
self.ip += 2;
|
||||
self.interpret()
|
||||
}
|
||||
PushBox => {
|
||||
let val = self.pop();
|
||||
self.stack.push(Value::Box(Rc::new(RefCell::new(val))));
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
GetKey => {
|
||||
let key = self.pop();
|
||||
|
|
@ -266,6 +274,7 @@ impl<'a> Vm<'a> {
|
|||
};
|
||||
self.push(value);
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
MatchTuple => {
|
||||
todo!()
|
||||
|
|
@ -277,20 +286,23 @@ impl<'a> Vm<'a> {
|
|||
} else {
|
||||
self.ip += 2;
|
||||
}
|
||||
self.interpret()
|
||||
}
|
||||
TypeOf => {
|
||||
let val = self.pop();
|
||||
let type_of = self.chunk.kw_from(val.type_of()).unwrap();
|
||||
self.push(type_of);
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
Truncate => {
|
||||
let val = self.pop();
|
||||
if let Value::Number(x) = val {
|
||||
self.push(Value::Number(x as usize as f64));
|
||||
self.ip += 1;
|
||||
self.interpret()
|
||||
} else {
|
||||
self.panic("repeate requires a number");
|
||||
Err(Panic("repeat requires a number"))
|
||||
}
|
||||
}
|
||||
Decrement => {
|
||||
|
|
@ -300,7 +312,7 @@ impl<'a> Vm<'a> {
|
|||
self.ip += 1;
|
||||
self.interpret()
|
||||
} else {
|
||||
self.panic("you may only decrement a number");
|
||||
Err(Panic("you may only decrement a number"))
|
||||
}
|
||||
}
|
||||
Duplicate => {
|
||||
|
|
@ -308,12 +320,7 @@ impl<'a> Vm<'a> {
|
|||
self.ip += 1;
|
||||
self.interpret()
|
||||
}
|
||||
MatchDepth => {
|
||||
self.match_depth = self.chunk.bytecode[self.ip + 1];
|
||||
self.ip += 2;
|
||||
self.interpret()
|
||||
}
|
||||
PanicNoWhen | PanicNoMatch => self.panic("no match"),
|
||||
PanicNoWhen | PanicNoMatch => Err(Panic("no match")),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user