imxyy1soope1/nixjit
1
0
Fork 0
Code Issues Pull Requests Actions Projects 1 Releases Activity

feat: error handling (partial)

Browse Source
This commit is contained in:
imxyy_soope_
2025-05-11 08:15:19 +08:00
parent 949352333e
commit 12aa654935
3 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ty/common.rs
View File

@@ -9,16 +9,12 @@ use regex::Regex;
#[derive(Clone, Debug, PartialEq, Constructor)] #[derive(Clone, Debug, PartialEq, Constructor)]
pub struct Catchable { pub struct Catchable {
msg: Option<String>, msg: String,
} }
impl Display for Catchable { impl Display for Catchable {
fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
if let Some(ref msg) = self.msg { write!(f, "<error: {}>", self.msg)
write!(f, "<error: {msg}>")
} else {
write!(f, "<error>")
}
} }
} }

92
src/ty/internal/mod.rs
View File

@@ -180,13 +180,13 @@ impl Value {
pub fn typename(&self) -> &'static str { pub fn typename(&self) -> &'static str {
use Value::*; use Value::*;
match self { match self {
Const(_) => todo!(), Const(_) => unreachable!(),
Thunk(_) => "thunk", Thunk(_) => "thunk",
ThunkRef(_) => "thunk", ThunkRef(_) => "thunk",
AttrSet(_) => "set", AttrSet(_) => "set",
RecAttrSet(_) => "set", RecAttrSet(_) => "set",
List(_) => "list", List(_) => "list",
Catchable(_) => todo!(), Catchable(_) => unreachable!(),
PrimOp(_) => "lambda", PrimOp(_) => "lambda",
PartialPrimOp(_) => "lambda", PartialPrimOp(_) => "lambda",
Func(_) => "lambda", Func(_) => "lambda",
@@ -240,6 +240,7 @@ impl Value {
use Const::*; use Const::*;
match (self, other) { match (self, other) {
(VmConst(Bool(a)), VmConst(Bool(b))) => VmConst(Bool(a && b)), (VmConst(Bool(a)), VmConst(Bool(b))) => VmConst(Bool(a && b)),
(x @ Value::Catchable(_), _) | (_, x @ Value::Catchable(_)) => x,
_ => todo!(), _ => todo!(),
} }
} }
@@ -248,13 +249,17 @@ impl Value {
use Const::*; use Const::*;
match (self, other) { match (self, other) {
(VmConst(Bool(a)), VmConst(Bool(b))) => VmConst(Bool(a || b)), (VmConst(Bool(a)), VmConst(Bool(b))) => VmConst(Bool(a || b)),
(x @ Value::Catchable(_), _) | (_, x @ Value::Catchable(_)) => x,
_ => todo!(), _ => todo!(),
} }
} }
pub fn eq(self, other: Value) -> Value { pub fn eq(self, other: Value) -> Value {
use Const::Bool; use Const::Bool;
VmConst(Bool(self == other)) match (self, other) {
(x @ Value::Catchable(_), _) | (_, x @ Value::Catchable(_)) => x,
(s, other) => VmConst(Bool(s == other)),
}
} }
pub fn lt(self, other: Value) -> Value { pub fn lt(self, other: Value) -> Value {
@@ -265,6 +270,7 @@ impl Value {
(VmConst(Float(a)), VmConst(Int(b))) => a < b as f64, (VmConst(Float(a)), VmConst(Int(b))) => a < b as f64,
(VmConst(Float(a)), VmConst(Float(b))) => a < b, (VmConst(Float(a)), VmConst(Float(b))) => a < b,
(VmConst(String(a)), VmConst(String(b))) => a < b, (VmConst(String(a)), VmConst(String(b))) => a < b,
(x @ Value::Catchable(_), _) | (_, x @ Value::Catchable(_)) => return x,
_ => todo!(), _ => todo!(),
})) }))
} }
@@ -274,6 +280,7 @@ impl Value {
match self { match self {
VmConst(Int(int)) => VmConst(Int(-int)), VmConst(Int(int)) => VmConst(Int(-int)),
VmConst(Float(float)) => VmConst(Float(-float)), VmConst(Float(float)) => VmConst(Float(-float)),
x @ Value::Catchable(_) => x,
_ => todo!(), _ => todo!(),
} }
} }
@@ -290,6 +297,7 @@ impl Value {
string.push_str(b.as_str()); string.push_str(b.as_str());
VmConst(String(string)) VmConst(String(string))
} }
(x @ Value::Catchable(_), _) | (_, x @ Value::Catchable(_)) => x,
_ => todo!(), _ => todo!(),
} }
} }
@@ -301,6 +309,7 @@ impl Value {
(VmConst(Int(a)), VmConst(Float(b))) => VmConst(Float(a as f64 * b)), (VmConst(Int(a)), VmConst(Float(b))) => VmConst(Float(a as f64 * b)),
(VmConst(Float(a)), VmConst(Int(b))) => VmConst(Float(a * b as f64)), (VmConst(Float(a)), VmConst(Int(b))) => VmConst(Float(a * b as f64)),
(VmConst(Float(a)), VmConst(Float(b))) => VmConst(Float(a * b)), (VmConst(Float(a)), VmConst(Float(b))) => VmConst(Float(a * b)),
(x @ Value::Catchable(_), _) | (_, x @ Value::Catchable(_)) => x,
_ => todo!(), _ => todo!(),
} }
} }
@@ -314,17 +323,17 @@ impl Value {
(VmConst(Int(a)), VmConst(Float(b))) => VmConst(Float(a as f64 / b)), (VmConst(Int(a)), VmConst(Float(b))) => VmConst(Float(a as f64 / b)),
(VmConst(Float(a)), VmConst(Int(b))) => VmConst(Float(a / b as f64)), (VmConst(Float(a)), VmConst(Int(b))) => VmConst(Float(a / b as f64)),
(VmConst(Float(a)), VmConst(Float(b))) => VmConst(Float(a / b)), (VmConst(Float(a)), VmConst(Float(b))) => VmConst(Float(a / b)),
(x @ Value::Catchable(_), _) | (_, x @ Value::Catchable(_)) => x,
_ => todo!(), _ => todo!(),
} }
} }
pub fn concat_string(&mut self, mut other: Value) -> &mut Self { pub fn concat_string(&mut self, mut other: Value) -> &mut Self {
if let (VmConst(Const::String(a)), VmConst(Const::String(b))) = match (self.coerce_to_string(), other.coerce_to_string()) {
(self.coerce_to_string(), other.coerce_to_string()) (VmConst(Const::String(a)), VmConst(Const::String(b))) => a.push_str(b.as_str()),
{ (_, Value::Catchable(_)) => *self = other,
a.push_str(b.as_str()); (Value::Catchable(_), _) => (),
} else { _ => todo!(),
todo!()
} }
self self
} }
@@ -332,6 +341,9 @@ impl Value {
pub fn push(&mut self, elem: Value) -> &mut Self { pub fn push(&mut self, elem: Value) -> &mut Self {
if let Value::List(list) = self { if let Value::List(list) = self {
list.push(elem); list.push(elem);
} else if let Value::Catchable(_) = self {
} else if let Value::Catchable(_) = elem {
*self = elem;
} else { } else {
todo!() todo!()
} }
@@ -339,10 +351,10 @@ impl Value {
} }
pub fn concat(self, other: Value) -> Value { pub fn concat(self, other: Value) -> Value {
if let (Value::List(a), Value::List(b)) = (self, other) { match (self, other) {
Value::List(a.concat(b)) (Value::List(a), Value::List(b)) => Value::List(a.concat(b)),
} else { (x @ Value::Catchable(_), _) | (_, x @ Value::Catchable(_)) => x,
todo!() _ => todo!(),
} }
} }
@@ -351,6 +363,9 @@ impl Value {
attrs.push_attr(sym, val) attrs.push_attr(sym, val)
} else if let Value::RecAttrSet(attrs) = self { } else if let Value::RecAttrSet(attrs) = self {
attrs.push_attr(sym, val) attrs.push_attr(sym, val)
} else if let Value::Catchable(_) = self {
} else if let Value::Catchable(_) = val {
*self = val
} else { } else {
todo!() todo!()
} }
@@ -362,38 +377,43 @@ impl Value {
(Value::AttrSet(a), Value::AttrSet(b)) => Value::AttrSet(a.update(b)), (Value::AttrSet(a), Value::AttrSet(b)) => Value::AttrSet(a.update(b)),
(Value::RecAttrSet(a), Value::AttrSet(b)) => Value::AttrSet(a.update_normal(b)), (Value::RecAttrSet(a), Value::AttrSet(b)) => Value::AttrSet(a.update_normal(b)),
(Value::AttrSet(a), Value::RecAttrSet(b)) => Value::AttrSet(a.update_rec(b)), (Value::AttrSet(a), Value::RecAttrSet(b)) => Value::AttrSet(a.update_rec(b)),
(x @ Value::Catchable(_), _) | (_, x @ Value::Catchable(_)) => x,
_ => todo!(), _ => todo!(),
} }
} }
pub fn select(&mut self, sym: Symbol) -> &mut Self { pub fn select(&mut self, sym: Symbol) -> Result<&mut Self> {
let val = match self { let val = match self {
Value::AttrSet(attrs) => attrs.select(sym.clone()).unwrap_or_else(|| { Value::AttrSet(attrs) => attrs
Value::Catchable(c::Catchable::new(Some(format!("{sym:?} not found")))) .select(sym.clone())
}), .ok_or_else(|| Error::EvalError(format!("{sym:?} not found"))),
Value::RecAttrSet(attrs) => attrs.select(sym.clone()).unwrap_or_else(|| { Value::RecAttrSet(attrs) => attrs
Value::Catchable(c::Catchable::new(Some(format!("{sym:?} not found")))) .select(sym.clone())
}), .ok_or_else(|| Error::EvalError(format!("{sym:?} not found"))),
_ => Value::Catchable(Catchable::new(Some(format!( Value::Catchable(_) => return Ok(self),
_ => Err(Error::EvalError(format!(
"cannot select from {:?}", "cannot select from {:?}",
self.typename() self.typename()
)))), ))),
}; }?;
*self = val; *self = val;
self Ok(self)
} }
pub fn select_with_default(&mut self, sym: Symbol, default: Value) -> &mut Self { pub fn select_with_default(&mut self, sym: Symbol, default: Value) -> Result<&mut Self> {
if let Value::AttrSet(attrs) = self { let val = match self {
let val = attrs.select(sym).unwrap_or(default); Value::AttrSet(attrs) => attrs.select(sym.clone()).unwrap_or(default),
*self = val; Value::RecAttrSet(attrs) => attrs.select(sym.clone()).unwrap_or(default),
} else if let Value::RecAttrSet(attrs) = self { Value::Catchable(_) => return Ok(self),
let val = attrs.select(sym).unwrap_or(default); _ => {
*self = val; return Err(Error::EvalError(format!(
} else { "cannot select from {:?}",
todo!() self.typename()
} )));
self }
};
*self = val;
Ok(self)
} }
pub fn has_attr(&mut self, sym: Symbol) -> &mut Self { pub fn has_attr(&mut self, sym: Symbol) -> &mut Self {
@@ -403,6 +423,7 @@ impl Value {
} else if let Value::RecAttrSet(attrs) = self { } else if let Value::RecAttrSet(attrs) = self {
let val = VmConst(Const::Bool(attrs.has_attr(sym))); let val = VmConst(Const::Bool(attrs.has_attr(sym)));
*self = val; *self = val;
} else if let Value::Catchable(_) = self {
} else { } else {
*self = VmConst(Const::Bool(false)); *self = VmConst(Const::Bool(false));
} }
@@ -411,6 +432,7 @@ impl Value {
pub fn coerce_to_string(&mut self) -> &mut Self { pub fn coerce_to_string(&mut self) -> &mut Self {
if let VmConst(Const::String(_)) = self { if let VmConst(Const::String(_)) = self {
} else if let Value::Catchable(_) = self {
} else { } else {
todo!() todo!()
} }

8
src/vm/mod.rs
View File

@@ -161,21 +161,21 @@ impl VM {
stack.tos_mut()?.push_attr(sym, val); stack.tos_mut()?.push_attr(sym, val);
} }
OpCode::Select { sym } => { OpCode::Select { sym } => {
stack.tos_mut()?.force(self)?.select(Symbol::new(sym)); stack.tos_mut()?.force(self)?.select(Symbol::new(sym))?;
} }
OpCode::SelectOrDefault { sym } => { OpCode::SelectOrDefault { sym } => {
let default = stack.pop(); let default = stack.pop();
stack stack
.tos_mut()? .tos_mut()?
.force(self)? .force(self)?
.select_with_default(Symbol::new(sym), default); .select_with_default(Symbol::new(sym), default)?;
} }
OpCode::SelectDynamic => { OpCode::SelectDynamic => {
let mut val = stack.pop(); let mut val = stack.pop();
val.force(self)?; val.force(self)?;
val.coerce_to_string(); val.coerce_to_string();
let sym = val.unwrap_const().unwrap_string().into(); let sym = val.unwrap_const().unwrap_string().into();
stack.tos_mut()?.force(self)?.select(sym); stack.tos_mut()?.force(self)?.select(sym)?;
} }
OpCode::SelectDynamicOrDefault => { OpCode::SelectDynamicOrDefault => {
let default = stack.pop(); let default = stack.pop();
@@ -186,7 +186,7 @@ impl VM {
stack stack
.tos_mut()? .tos_mut()?
.force(self)? .force(self)?
.select_with_default(sym, default); .select_with_default(sym, default)?;
} }
OpCode::HasAttr { sym } => { OpCode::HasAttr { sym } => {
stack.tos_mut()?.force(self)?.has_attr(Symbol::new(sym)); stack.tos_mut()?.force(self)?.has_attr(Symbol::new(sym));