feat: generalize env
This commit is contained in:
@@ -10,8 +10,8 @@ use crate::bytecode::Func as BFunc;
|
||||
use crate::error::Result;
|
||||
use crate::ir;
|
||||
use crate::jit::JITFunc;
|
||||
use crate::ty::internal::{AttrSet, Thunk, Value};
|
||||
use crate::vm::{LetEnv, VM};
|
||||
use crate::ty::internal::{Thunk, Value};
|
||||
use crate::vm::{VmEnv, VM};
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum Param {
|
||||
@@ -46,7 +46,7 @@ impl From<ir::Param> for Param {
|
||||
#[derive(Debug, Clone, Constructor)]
|
||||
pub struct Func<'jit: 'vm, 'vm> {
|
||||
pub func: &'vm BFunc,
|
||||
pub env: Rc<LetEnv<'jit, 'vm>>,
|
||||
pub env: Rc<VmEnv<'jit, 'vm>>,
|
||||
pub compiled: OnceCell<JitFunction<'jit, JITFunc<'jit, 'vm>>>,
|
||||
pub count: Cell<usize>,
|
||||
}
|
||||
@@ -86,7 +86,7 @@ impl<'vm, 'jit: 'vm> Func<'jit, 'vm> {
|
||||
if let Some(alias) = alias {
|
||||
new.insert(alias, Value::AttrSet(arg));
|
||||
}
|
||||
self.env.clone().enter_attrs(AttrSet::new(new).into())
|
||||
self.env.clone().enter_attrs(new.into())
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user