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

feat: ref

Browse Source
This commit is contained in:
imxyy_soope_
2025-05-11 10:19:55 +08:00
parent cbb29276d8
commit 7cbb082dc4
12 changed files with 180 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,20 +30,20 @@ pub trait ToPublic {
}
#[derive(Debug, Clone)]
pub struct Thunk {
pub thunk: RefCell<_Thunk>,
pub env: RefCell<Option<Arc<Env>>>,
pub struct Thunk<'vm> {
pub thunk: RefCell<_Thunk<'vm>>,
pub env: RefCell<Option<Arc<Env<'vm>>>>,
}
#[derive(Debug, IsVariant, Unwrap, Clone)]
pub enum _Thunk {
pub enum _Thunk<'vm> {
Code(OpCodes),
SuspendedFrom(*const Thunk),
Value(Box<Value>),
SuspendedFrom(*const Thunk<'vm>),
Value(Box<Value<'vm>>),
}
impl Thunk {
pub fn new(opcodes: OpCodes) -> Thunk {
impl<'vm> Thunk<'vm> {
pub fn new(opcodes: OpCodes) -> Self {
Thunk {
thunk: RefCell::new(_Thunk::Code(opcodes)),
env: RefCell::new(None),
@@ -54,11 +54,11 @@ impl Thunk {
self.thunk.borrow().clone().unwrap_code()
}
pub fn capture(&self, env: Arc<Env>) {
pub fn capture(&self, env: Arc<Env<'vm>>) {
*self.env.borrow_mut() = Some(env);
}
pub fn force(&self, vm: &VM) -> Result<Value> {
pub fn force(&self, vm: &VM<'vm>) -> Result<Value<'vm>> {
match &*self.thunk.borrow() {
_Thunk::Value(value) => return Ok(value.as_ref().clone()),
_Thunk::SuspendedFrom(from) => {
@@ -82,7 +82,7 @@ impl Thunk {
Ok(value)
}
pub fn value(&self) -> Option<Value> {
pub fn value(&'vm self) -> Option<Value<'vm>> {
match &*self.thunk.borrow() {
_Thunk::Value(value) => Some(value.as_ref().clone()),
_ => None,
@@ -90,62 +90,60 @@ impl Thunk {
}
}
impl PartialEq for Thunk {
impl PartialEq for Thunk<'_> {
fn eq(&self, _: &Self) -> bool {
false
}
}
#[derive(Debug, IsVariant, Unwrap, Clone, PartialEq)]
pub enum Value {
pub enum Value<'vm> {
Const(Const),
Thunk(Thunk),
ThunkRef(usize),
AttrSet(AttrSet),
RecAttrSet(RecAttrSet),
List(List),
Thunk(Thunk<'vm>),
ThunkRef(&'vm Thunk<'vm>),
AttrSet(AttrSet<'vm>),
RecAttrSet(RecAttrSet<'vm>),
List(List<'vm>),
Catchable(c::Catchable),
PrimOp(PrimOp),
PartialPrimOp(PartialPrimOp),
Func(usize),
PrimOp(PrimOp<'vm>),
PartialPrimOp(PartialPrimOp<'vm>),
Func(&'vm Func<'vm>),
}
#[derive(Debug, IsVariant, Unwrap, Clone, PartialEq)]
pub enum ValueAsRef<'v> {
pub enum ValueAsRef<'v, 'vm: 'v> {
Const(&'v Const),
Thunk(&'v Thunk),
ThunkRef(&'v usize),
AttrSet(&'v AttrSet),
RecAttrSet(&'v RecAttrSet),
List(&'v List),
Thunk(&'v Thunk<'vm>),
AttrSet(&'v AttrSet<'vm>),
RecAttrSet(&'v RecAttrSet<'vm>),
List(&'v List<'vm>),
Catchable(&'v c::Catchable),
PrimOp(&'v PrimOp),
PartialPrimOp(&'v PartialPrimOp),
Func(&'v usize),
PrimOp(&'v PrimOp<'vm>),
PartialPrimOp(&'v PartialPrimOp<'vm>),
Func(&'vm Func<'vm>),
}
#[derive(Debug, IsVariant, Unwrap, PartialEq)]
pub enum ValueAsMut<'v> {
pub enum ValueAsMut<'v, 'vm: 'v> {
Const(&'v mut Const),
Thunk(&'v Thunk),
ThunkRef(&'v usize),
AttrSet(&'v mut AttrSet),
RecAttrSet(&'v mut RecAttrSet),
List(&'v mut List),
Thunk(&'v Thunk<'vm>),
AttrSet(&'v mut AttrSet<'vm>),
RecAttrSet(&'v mut RecAttrSet<'vm>),
List(&'v mut List<'vm>),
Catchable(&'v mut c::Catchable),
PrimOp(&'v mut PrimOp),
PartialPrimOp(&'v mut PartialPrimOp),
Func(&'v usize),
PrimOp(&'v mut PrimOp<'vm>),
PartialPrimOp(&'v mut PartialPrimOp<'vm>),
Func(&'vm Func<'vm>),
}
impl Value {
pub fn as_ref(&self) -> ValueAsRef {
impl<'v, 'vm: 'v> Value<'vm> {
pub fn as_ref(&'vm self) -> ValueAsRef<'v, 'vm> {
use Value::*;
use ValueAsRef as R;
match self {
Const(x) => R::Const(x),
Thunk(x) => R::Thunk(x),
ThunkRef(x) => R::ThunkRef(x),
ThunkRef(x) => R::Thunk(x),
AttrSet(x) => R::AttrSet(x),
RecAttrSet(x) => R::RecAttrSet(x),
List(x) => R::List(x),
@@ -156,13 +154,13 @@ impl Value {
}
}
pub fn as_mut(&mut self) -> ValueAsMut {
pub fn as_mut(&'vm mut self) -> ValueAsMut<'v, 'vm> {
use Value::*;
use ValueAsMut as M;
match self {
Const(x) => M::Const(x),
Thunk(x) => M::Thunk(x),
ThunkRef(x) => M::ThunkRef(x),
ThunkRef(x) => M::Thunk(x),
AttrSet(x) => M::AttrSet(x),
RecAttrSet(x) => M::RecAttrSet(x),
List(x) => M::List(x),
@@ -175,7 +173,7 @@ impl Value {
}
use Value::Const as VmConst;
impl Value {
impl<'vm> Value<'vm> {
pub fn typename(&self) -> &'static str {
use Value::*;
match self {
@@ -200,7 +198,7 @@ impl Value {
}
}
pub fn call(self, vm: &VM, args: Vec<Value>) -> Result<Value> {
pub fn call(self, vm: &VM<'vm>, args: Vec<Value<'vm>>) -> Result<Value<'vm>> {
use Value::*;
Ok(match self {
PrimOp(func) => func.call(vm, args),
@@ -215,7 +213,7 @@ impl Value {
PartialPrimOp(func) => {
return Ok(func.call(vm, [arg].into_iter().chain(iter).collect()));
}
Func(func) => vm.get_func(func).call(vm, arg)?,
Func(func) => func.call(vm, arg)?,
_ => todo!(),
}
}
@@ -226,7 +224,7 @@ impl Value {
})
}
pub fn not(self) -> Value {
pub fn not(self) -> Value<'vm> {
use Const::*;
match self {
VmConst(Bool(bool)) => VmConst(Bool(!bool)),
@@ -235,7 +233,7 @@ impl Value {
}
}
pub fn and(self, other: Value) -> Value {
pub fn and(self, other: Value<'vm>) -> Value<'vm> {
use Const::*;
match (self, other) {
(VmConst(Bool(a)), VmConst(Bool(b))) => VmConst(Bool(a && b)),
@@ -244,7 +242,7 @@ impl Value {
}
}
pub fn or(self, other: Value) -> Value {
pub fn or(self, other: Value<'vm>) -> Value<'vm> {
use Const::*;
match (self, other) {
(VmConst(Bool(a)), VmConst(Bool(b))) => VmConst(Bool(a || b)),
@@ -253,7 +251,7 @@ impl Value {
}
}
pub fn eq(self, other: Value) -> Value {
pub fn eq(self, other: Value<'vm>) -> Value<'vm> {
use Const::Bool;
match (self, other) {
(x @ Value::Catchable(_), _) | (_, x @ Value::Catchable(_)) => x,
@@ -261,7 +259,7 @@ impl Value {
}
}
pub fn lt(self, other: Value) -> Value {
pub fn lt(self, other: Value<'vm>) -> Value<'vm> {
use Const::*;
VmConst(Bool(match (self, other) {
(VmConst(Int(a)), VmConst(Int(b))) => a < b,
@@ -274,7 +272,7 @@ impl Value {
}))
}
pub fn neg(self) -> Value {
pub fn neg(self) -> Value<'vm> {
use Const::*;
match self {
VmConst(Int(int)) => VmConst(Int(-int)),
@@ -284,7 +282,7 @@ impl Value {
}
}
pub fn add(self, other: Value) -> Value {
pub fn add(self, other: Value<'vm>) -> Value<'vm> {
use Const::*;
match (self, other) {
(VmConst(Int(a)), VmConst(Int(b))) => VmConst(Int(a + b)),
@@ -301,7 +299,7 @@ impl Value {
}
}
pub fn mul(self, other: Value) -> Value {
pub fn mul(self, other: Value<'vm>) -> Value<'vm> {
use Const::*;
match (self, other) {
(VmConst(Int(a)), VmConst(Int(b))) => VmConst(Int(a * b)),
@@ -313,7 +311,7 @@ impl Value {
}
}
pub fn div(self, other: Value) -> Value {
pub fn div(self, other: Value<'vm>) -> Value<'vm> {
use Const::*;
match (self, other) {
(_, VmConst(Int(0))) => todo!(),
@@ -327,7 +325,7 @@ impl Value {
}
}
pub fn concat_string(&mut self, mut other: Value) -> &mut Self {
pub fn concat_string(&mut self, mut other: Value<'vm>) -> &mut Self {
match (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,
@@ -337,7 +335,7 @@ impl Value {
self
}
pub fn push(&mut self, elem: Value) -> &mut Self {
pub fn push(&mut self, elem: Value<'vm>) -> &mut Self {
if let Value::List(list) = self {
list.push(elem);
} else if let Value::Catchable(_) = self {
@@ -349,7 +347,7 @@ impl Value {
self
}
pub fn concat(self, other: Value) -> Value {
pub fn concat(self, other: Value<'vm>) -> Value<'vm> {
match (self, other) {
(Value::List(a), Value::List(b)) => Value::List(a.concat(b)),
(x @ Value::Catchable(_), _) | (_, x @ Value::Catchable(_)) => x,
@@ -357,7 +355,7 @@ impl Value {
}
}
pub fn push_attr(&mut self, sym: Symbol, val: Value) -> &mut Self {
pub fn push_attr(&mut self, sym: Symbol, val: Value<'vm>) -> &mut Self {
if let Value::AttrSet(attrs) = self {
attrs.push_attr(sym, val)
} else if let Value::RecAttrSet(attrs) = self {
@@ -371,7 +369,7 @@ impl Value {
self
}
pub fn update(self, other: Value) -> Value {
pub fn update(self, other: Value<'vm>) -> Value<'vm> {
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)),
@@ -399,7 +397,7 @@ impl Value {
Ok(self)
}
pub fn select_with_default(&mut self, sym: Symbol, default: Value) -> Result<&mut Self> {
pub fn select_with_default(&mut self, sym: Symbol, default: Value<'vm>) -> Result<&mut Self> {
let val = match self {
Value::AttrSet(attrs) => attrs.select(sym.clone()).unwrap_or(default),
Value::RecAttrSet(attrs) => attrs.select(sym.clone()).unwrap_or(default),
@@ -438,7 +436,7 @@ impl Value {
self
}
pub fn force(&mut self, vm: &VM) -> Result<&mut Self> {
pub fn force(&mut self, vm: &VM<'vm>) -> Result<&mut Self> {
if let Value::Thunk(thunk) = self {
let value = thunk.force(vm)?;
*self = value
@@ -446,7 +444,7 @@ impl Value {
Ok(self)
}
pub fn force_deep(&mut self, vm: &VM) -> Result<&mut Self> {
pub fn force_deep(&mut self, vm: &VM<'vm>) -> Result<&mut Self> {
match self {
Value::Thunk(thunk) => {
let mut value = thunk.force(vm)?;
@@ -462,7 +460,7 @@ impl Value {
}
}
impl ToPublic for Value {
impl ToPublic for Value<'_> {
fn to_public(self, vm: &VM) -> p::Value {
match self {
Value::AttrSet(attrs) => attrs.to_public(vm),