feat: refactor

This commit is contained in:
2025-05-03 16:22:05 +08:00
parent 43cfb9be62
commit f78c516d17
19 changed files with 361 additions and 345 deletions

View File

@@ -3,39 +3,55 @@ use derive_more::Constructor;
use super::vm::Env;
use super::vm::Symbol;
use super::vm::Value;
use crate::bytecode::Const;
use crate::value::Const;
pub fn env() -> Env {
let mut env = Env::empty();
env.insert(Symbol::from("true"), Value::Const(Const::Bool(true)));
env.insert(Symbol::from("false"), Value::Const(Const::Bool(false)));
env.insert(Symbol::from("__add"), Value::PrimOp(PrimOp::new(2, |args| {
let [first, second]: [Value; 2] = args.try_into().unwrap();
first.add(second)
})));
env.insert(Symbol::from("__sub"), Value::PrimOp(PrimOp::new(2, |args| {
let [first, second]: [Value; 2] = args.try_into().unwrap();
first.add(second.neg())
})));
env.insert(Symbol::from("__mul"), Value::PrimOp(PrimOp::new(2, |args| {
let [first, second]: [Value; 2] = args.try_into().unwrap();
first.mul(second)
})));
env.insert(Symbol::from("__div"), Value::PrimOp(PrimOp::new(2, |args| {
let [first, second]: [Value; 2] = args.try_into().unwrap();
first.div(second)
})));
env.insert(Symbol::from("__lessThan"), Value::PrimOp(PrimOp::new(2, |args| {
let [first, second]: [Value; 2] = args.try_into().unwrap();
first.lt(second)
})));
env.insert(
Symbol::from("__add"),
Value::PrimOp(PrimOp::new("add", 2, |args| {
let [first, second]: [Value; 2] = args.try_into().unwrap();
first.add(second)
})),
);
env.insert(
Symbol::from("__sub"),
Value::PrimOp(PrimOp::new("sub", 2, |args| {
let [first, second]: [Value; 2] = args.try_into().unwrap();
first.add(second.neg())
})),
);
env.insert(
Symbol::from("__mul"),
Value::PrimOp(PrimOp::new("mul", 2, |args| {
let [first, second]: [Value; 2] = args.try_into().unwrap();
first.mul(second)
})),
);
env.insert(
Symbol::from("__div"),
Value::PrimOp(PrimOp::new("div", 2, |args| {
let [first, second]: [Value; 2] = args.try_into().unwrap();
first.div(second)
})),
);
env.insert(
Symbol::from("__lessThan"),
Value::PrimOp(PrimOp::new("lessThan", 2, |args| {
let [first, second]: [Value; 2] = args.try_into().unwrap();
first.lt(second)
})),
);
env
}
#[derive(Debug, Clone, Constructor)]
pub struct PrimOp {
name: &'static str,
arity: u8,
func: fn(Vec<Value>) -> Value,
}
@@ -49,7 +65,12 @@ impl PartialEq for PrimOp {
impl PrimOp {
pub fn call(self, args: Vec<Value>) -> Value {
if (args.len() as u8) < self.arity {
Value::PartialPrimOp(PartialPrimOp { arity: self.arity - args.len() as u8, args, func: self.func })
Value::PartialPrimOp(PartialPrimOp {
name: self.name,
arity: self.arity - args.len() as u8,
args,
func: self.func,
})
} else if args.len() as u8 == self.arity {
(self.func)(args)
} else {
@@ -58,11 +79,12 @@ impl PrimOp {
}
}
#[derive(Debug, Clone)]
#[derive(Debug, Clone)]
pub struct PartialPrimOp {
name: &'static str,
arity: u8,
args: Vec<Value>,
func: fn(Vec<Value>) -> Value
func: fn(Vec<Value>) -> Value,
}
impl PartialEq for PartialPrimOp {
@@ -76,7 +98,12 @@ impl PartialPrimOp {
let len = args.len() as u8;
self.args.extend(args);
if len < self.arity {
Value::PartialPrimOp(PartialPrimOp { arity: self.arity - len, args: self.args, func: self.func })
Value::PartialPrimOp(PartialPrimOp {
name: self.name,
arity: self.arity - len,
args: self.args,
func: self.func,
})
} else if len == self.arity {
(self.func)(self.args)
} else {