feat: usable?
This commit is contained in:
@@ -1,27 +1,26 @@
|
||||
use anyhow::Result;
|
||||
use derive_more::{Constructor, IsVariant, Unwrap};
|
||||
|
||||
use super::public as p;
|
||||
use super::common as c;
|
||||
use super::public as p;
|
||||
|
||||
use c::Symbol;
|
||||
|
||||
use crate::vm::Env;
|
||||
use crate::vm::VM;
|
||||
|
||||
mod attrset;
|
||||
mod list;
|
||||
mod string;
|
||||
mod func;
|
||||
mod cnst;
|
||||
mod func;
|
||||
mod list;
|
||||
mod primop;
|
||||
mod string;
|
||||
|
||||
pub use attrset::AttrSet;
|
||||
pub use list::List;
|
||||
pub use string::ContextfulString;
|
||||
pub use func::*;
|
||||
pub use primop::*;
|
||||
pub use attrset::*;
|
||||
pub use cnst::Const;
|
||||
pub use func::*;
|
||||
pub use list::List;
|
||||
pub use primop::*;
|
||||
pub use string::ContextfulString;
|
||||
|
||||
pub trait ToPublic {
|
||||
fn to_public(self, vm: &VM) -> p::Value;
|
||||
@@ -35,12 +34,12 @@ pub enum Value {
|
||||
Const(Const),
|
||||
Thunk(Thunk),
|
||||
AttrSet(AttrSet),
|
||||
RecAttrSet(RecAttrSet),
|
||||
List(List),
|
||||
Catchable(c::Catchable),
|
||||
PrimOp(PrimOp),
|
||||
PartialPrimOp(PartialPrimOp),
|
||||
Func(Func),
|
||||
// FuncWithEnv(Func)
|
||||
}
|
||||
|
||||
#[derive(Debug, IsVariant, Unwrap, Clone, PartialEq)]
|
||||
@@ -48,6 +47,7 @@ pub enum ValueAsRef<'a> {
|
||||
Const(&'a Const),
|
||||
Thunk(&'a Thunk),
|
||||
AttrSet(&'a AttrSet),
|
||||
RecAttrSet(&'a RecAttrSet),
|
||||
List(&'a List),
|
||||
Catchable(&'a c::Catchable),
|
||||
PrimOp(&'a PrimOp),
|
||||
@@ -60,6 +60,7 @@ pub enum ValueAsMut<'a> {
|
||||
Const(&'a mut Const),
|
||||
Thunk(&'a mut Thunk),
|
||||
AttrSet(&'a mut AttrSet),
|
||||
RecAttrSet(&'a mut RecAttrSet),
|
||||
List(&'a mut List),
|
||||
Catchable(&'a mut c::Catchable),
|
||||
PrimOp(&'a mut PrimOp),
|
||||
@@ -75,6 +76,7 @@ impl Value {
|
||||
Const(x) => R::Const(x),
|
||||
Thunk(x) => R::Thunk(x),
|
||||
AttrSet(x) => R::AttrSet(x),
|
||||
RecAttrSet(x) => R::RecAttrSet(x),
|
||||
List(x) => R::List(x),
|
||||
Catchable(x) => R::Catchable(x),
|
||||
PrimOp(x) => R::PrimOp(x),
|
||||
@@ -90,6 +92,7 @@ impl Value {
|
||||
Const(x) => M::Const(x),
|
||||
Thunk(x) => M::Thunk(x),
|
||||
AttrSet(x) => M::AttrSet(x),
|
||||
RecAttrSet(x) => M::RecAttrSet(x),
|
||||
List(x) => M::List(x),
|
||||
Catchable(x) => M::Catchable(x),
|
||||
PrimOp(x) => M::PrimOp(x),
|
||||
@@ -104,7 +107,7 @@ impl Value {
|
||||
pub fn callable(&self) -> bool {
|
||||
match self {
|
||||
Value::PrimOp(_) | Value::PartialPrimOp(_) | Value::Func(_) => true,
|
||||
Value::AttrSet(_) => todo!(),
|
||||
Value::AttrSet(_) | Value::RecAttrSet(_) => todo!(),
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
@@ -112,16 +115,20 @@ impl Value {
|
||||
pub fn call(self, vm: &VM, args: Vec<Value>) -> Value {
|
||||
use Value::*;
|
||||
match self {
|
||||
PrimOp(func) => func.call(args),
|
||||
PartialPrimOp(func) => func.call(args),
|
||||
PrimOp(func) => func.call(vm, args),
|
||||
PartialPrimOp(func) => func.call(vm, args),
|
||||
mut func @ Value::Func(_) => {
|
||||
let mut iter = args.into_iter();
|
||||
while let Some(arg) = iter.next() {
|
||||
func = match func {
|
||||
PrimOp(func) => return func.call([arg].into_iter().chain(iter).collect()),
|
||||
PartialPrimOp(func) => return func.call([arg].into_iter().chain(iter).collect()),
|
||||
PrimOp(func) => {
|
||||
return func.call(vm, [arg].into_iter().chain(iter).collect());
|
||||
}
|
||||
PartialPrimOp(func) => {
|
||||
return func.call(vm, [arg].into_iter().chain(iter).collect());
|
||||
}
|
||||
Func(func) => func.call(vm, arg),
|
||||
_ => todo!()
|
||||
_ => todo!(),
|
||||
}
|
||||
}
|
||||
func
|
||||
@@ -251,6 +258,8 @@ impl Value {
|
||||
pub fn push_attr(&mut self, sym: Symbol, val: Value) -> &mut Self {
|
||||
if let Value::AttrSet(attrs) = self {
|
||||
attrs.push_attr(sym, val)
|
||||
} else if let Value::RecAttrSet(attrs) = self {
|
||||
attrs.push_attr(sym, val)
|
||||
} else {
|
||||
todo!()
|
||||
}
|
||||
@@ -258,10 +267,11 @@ impl Value {
|
||||
}
|
||||
|
||||
pub fn update(self, other: Value) -> Value {
|
||||
if let (Value::AttrSet(a), Value::AttrSet(b)) = (self, other) {
|
||||
Value::AttrSet(a.update(b))
|
||||
} else {
|
||||
todo!()
|
||||
match (self, other) {
|
||||
(Value::AttrSet(a), Value::AttrSet(b)) => Value::AttrSet(a.update(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)),
|
||||
_ => todo!(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -273,6 +283,13 @@ impl Value {
|
||||
"{sym:?} not found"
|
||||
)))));
|
||||
*self = val;
|
||||
} else if let Value::RecAttrSet(attrs) = self {
|
||||
let val = attrs
|
||||
.select(sym.clone())
|
||||
.unwrap_or(Value::Catchable(c::Catchable::new(Some(format!(
|
||||
"{sym:?} not found"
|
||||
)))));
|
||||
*self = val;
|
||||
} else {
|
||||
todo!()
|
||||
}
|
||||
@@ -283,6 +300,9 @@ impl Value {
|
||||
if let Value::AttrSet(attrs) = self {
|
||||
let val = attrs.select(sym).unwrap_or(default);
|
||||
*self = val;
|
||||
} else if let Value::RecAttrSet(attrs) = self {
|
||||
let val = attrs.select(sym).unwrap_or(default);
|
||||
*self = val;
|
||||
} else {
|
||||
todo!()
|
||||
}
|
||||
@@ -293,6 +313,9 @@ impl Value {
|
||||
if let Value::AttrSet(attrs) = self {
|
||||
let val = VmConst(Const::Bool(attrs.has_attr(sym)));
|
||||
*self = val;
|
||||
} else if let Value::RecAttrSet(attrs) = self {
|
||||
let val = VmConst(Const::Bool(attrs.has_attr(sym)));
|
||||
*self = val;
|
||||
} else {
|
||||
*self = VmConst(Const::Bool(false));
|
||||
}
|
||||
@@ -308,19 +331,35 @@ impl Value {
|
||||
self
|
||||
}
|
||||
|
||||
pub fn force(&mut self, vm: &VM, env: &mut Env) -> Result<&mut Self> {
|
||||
pub fn force(&mut self, vm: &VM) -> Result<&mut Self> {
|
||||
if let Value::Thunk(thunk) = self {
|
||||
let value = vm.get_thunk_value(thunk.0, env)?;
|
||||
let value = vm.get_thunk_value(thunk.0)?;
|
||||
*self = value
|
||||
}
|
||||
Ok(self)
|
||||
}
|
||||
|
||||
pub fn force_deep(&mut self, vm: &VM) -> Result<&mut Self> {
|
||||
match self {
|
||||
Value::Thunk(thunk) => {
|
||||
let mut value = vm.get_thunk_value(thunk.0)?;
|
||||
value.force_deep(vm)?;
|
||||
*self = value;
|
||||
}
|
||||
Value::List(list) => list.force_deep(vm)?,
|
||||
Value::AttrSet(attrs) => attrs.force_deep(vm)?,
|
||||
Value::RecAttrSet(attrs) => attrs.force_deep(vm)?,
|
||||
_ => (),
|
||||
}
|
||||
Ok(self)
|
||||
}
|
||||
}
|
||||
|
||||
impl ToPublic for Value {
|
||||
fn to_public(self, vm: &VM) -> p::Value {
|
||||
match self {
|
||||
Value::AttrSet(attrs) => attrs.to_public(vm),
|
||||
Value::RecAttrSet(attrs) => attrs.to_public(vm),
|
||||
Value::List(list) => list.to_public(vm),
|
||||
Value::Catchable(catchable) => p::Value::Catchable(catchable),
|
||||
Value::Const(cnst) => p::Value::Const(cnst.into()),
|
||||
|
||||
Reference in New Issue
Block a user