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

Compare commits

base: scott:2ce2e2c2d3a8a169048dc2dc02ecaa0964df8e90
Branches Tags
scott:main
scott:bytecode
...
compare: scott:5ae47428404cb4199291b29ec6351de6f2fa55e0
Branches Tags
scott:bytecode
scott:main

3 Commits
2ce2e2c2d3 ... 5ae4742840

Author SHA1 Message Date
Scott Richmond
5ae4742840 save work, working on function clause guards, extra pop instructions are showing up after function definitions 2025-06-04 19:02:19 -04:00
Scott Richmond
0f8645d2eb guards work in match forms 2025-06-04 18:55:40 -04:00
Scott Richmond
01ce043379 guards work in match forms 2025-06-04 18:51:07 -04:00
2 changed files with 49 additions and 56 deletions
Show Stats Expand all files Collapse all files

98
src/compiler.rs
View File

@ -5,6 +5,7 @@ use crate::value::*;
use chumsky::prelude::SimpleSpan;
use num_derive::{FromPrimitive, ToPrimitive};
use num_traits::FromPrimitive;
use std::borrow::Borrow;
use std::cell::RefCell;
use std::collections::HashMap;
use std::rc::Rc;
@ -911,61 +912,41 @@ impl<'a> Compiler<'a> {
let mut jump_idxes = vec![];
let mut clauses = clauses.iter();
while let Some((MatchClause(pattern, guard, body), _)) = clauses.next() {
let mut no_match_jumps = vec![];
self.scope_depth += 1;
self.match_depth = 0;
self.visit(pattern);
self.emit_op(Op::JumpIfNoMatch);
let jnm_jump_idx = self.len();
no_match_jumps.push(self.len());
self.emit_byte(0xff);
// conditional compilation of guards
// hard to DRY out
match guard.as_ref() {
Some(_) => todo!(),
// Some(expr) => {
// self.visit(expr);
// self.emit_op(Op::JumpIfFalse);
// let jif_idx = self.len();
// self.emit_byte(0xff);
// self.visit(body);
// self.emit_op(Op::Store);
// self.scope_depth -= 1;
// while let Some(binding) = self.bindings.last() {
// if binding.depth > self.scope_depth {
// self.pop();
// // self.emit_op(Op::Pop);
// self.bindings.pop();
// } else {
// break;
// }
// }
// self.emit_op(Op::Jump);
// jump_idxes.push(self.len());
// self.emit_byte(0xff);
// self.chunk.bytecode[jnm_jump_idx] =
// self.len() as u8 - jnm_jump_idx as u8 - 1;
// self.chunk.bytecode[jif_idx] = self.len() as u8 - jif_idx as u8 - 1;
// }
None => {
self.visit(body);
self.emit_op(Op::Store);
self.scope_depth -= 1;
while let Some(binding) = self.bindings.last() {
if binding.depth > self.scope_depth {
self.bindings.pop();
} else {
break;
}
}
while self.stack_depth > stack_depth {
self.pop();
}
self.emit_op(Op::Jump);
jump_idxes.push(self.len());
self.emit_byte(0xff);
self.chunk.bytecode[jnm_jump_idx] =
self.len() as u8 - jnm_jump_idx as u8 - 1;
if guard.is_some() {
let guard_expr: &'static Spanned<Ast> =
Box::leak(Box::new(guard.clone().unwrap()));
self.visit(guard_expr);
self.emit_op(Op::JumpIfFalse);
no_match_jumps.push(self.len());
self.emit_byte(0xff);
self.stack_depth -= 1;
}
self.visit(body);
self.emit_op(Op::Store);
self.scope_depth -= 1;
while let Some(binding) = self.bindings.last() {
if binding.depth > self.scope_depth {
self.bindings.pop();
} else {
break;
}
}
while self.stack_depth > stack_depth {
self.pop();
}
self.emit_op(Op::Jump);
jump_idxes.push(self.len());
self.emit_byte(0xff);
for idx in no_match_jumps {
self.chunk.bytecode[idx] = self.len() as u8 - idx as u8 - 1;
}
}
self.emit_op(Op::PanicNoMatch);
for idx in jump_idxes {
@ -991,7 +972,7 @@ impl<'a> Compiler<'a> {
let mut upvalues = vec![];
for clause in fn_body {
let MatchClause(pattern, _, clause_body) = &clause.0 else {
let MatchClause(pattern, guard, clause_body) = &clause.0 else {
unreachable!()
};
let TuplePattern(pattern) = &pattern.0 else {
@ -1040,9 +1021,20 @@ impl<'a> Compiler<'a> {
compiler.emit_op(Op::Pop);
}
compiler.chunk.bytecode[jump_idx] = compiler.len() as u8 - jump_idx as u8 - 1;
let mut no_match_jumps = vec![];
compiler.emit_op(Op::JumpIfNoMatch);
let jnm_idx = compiler.len();
// let jnm_idx = compiler.len();
no_match_jumps.push(compiler.len());
compiler.emit_byte(0xff);
if guard.is_some() {
let guard_expr: &'static Spanned<Ast> =
Box::leak(Box::new(guard.clone().unwrap()));
compiler.visit(guard_expr);
compiler.emit_op(Op::JumpIfFalse);
no_match_jumps.push(self.len());
compiler.emit_byte(0xff);
compiler.stack_depth -= 1;
}
compiler.visit(clause_body);
compiler.emit_op(Op::Store);
compiler.scope_depth -= 1;
@ -1058,7 +1050,10 @@ impl<'a> Compiler<'a> {
}
compiler.stack_depth = 0;
compiler.emit_op(Op::Return);
compiler.chunk.bytecode[jnm_idx] = compiler.len() as u8 - jnm_idx as u8 - 1;
for idx in no_match_jumps {
compiler.chunk.bytecode[idx] = compiler.len() as u8 - idx as u8 - 1;
}
// compiler.chunk.bytecode[jnm_idx] = compiler.len() as u8 - jnm_idx as u8 - 1;
compiler.scope_depth -= 1;
std::mem::swap(&mut compiler.upvalues, &mut upvalues);
@ -1088,7 +1083,6 @@ impl<'a> Compiler<'a> {
self.emit_constant(init_val);
self.bind(name);
// TODO: close over everything accessed in the function
for upvalue in upvalues {
self.emit_op(Op::SetUpvalue);
self.emit_byte(upvalue.stack_pos);

7
src/main.rs
View File

@ -76,12 +76,11 @@ pub fn run(src: &'static str) {
pub fn main() {
env::set_var("RUST_BACKTRACE", "1");
let src = "
let bar = 42
let foo = {
let (1, 2, 3) = (1, 2, 3)
}
fn foo () -> :foo
foo
";
run(src);
}