feat: ref

src/ty/internal/attrset.rs

@@ -12,29 +12,29 @@ use super::super::public as p;
 use super::{ToPublic, Value};
 
 #[derive(Debug, Constructor, Clone, PartialEq)]
-pub struct AttrSet {
-    data: HashTrieMapSync<Symbol, Value>,
+pub struct AttrSet<'vm> {
+    data: HashTrieMapSync<Symbol, Value<'vm>>,
 }
 
-impl AttrSet {
+impl<'vm> AttrSet<'vm> {
     pub fn empty() -> Self {
         AttrSet {
             data: HashTrieMapSync::new_sync(),
         }
     }
 
-    pub fn push_attr_force(&mut self, sym: Symbol, val: Value) {
+    pub fn push_attr_force(&mut self, sym: Symbol, val: Value<'vm>) {
         self.data.insert_mut(sym, val);
     }
 
-    pub fn push_attr(&mut self, sym: Symbol, val: Value) {
+    pub fn push_attr(&mut self, sym: Symbol, val: Value<'vm>) {
         if self.data.get_mut(&sym).is_some() {
             todo!()
         }
         self.data.insert_mut(sym, val);
     }
 
-    pub fn select(&self, sym: Symbol) -> Option<Value> {
+    pub fn select(&self, sym: Symbol) -> Option<Value<'vm>> {
         self.data.get(&sym).cloned()
     }
 
@@ -42,29 +42,29 @@ impl AttrSet {
         self.data.get(&sym).is_some()
     }
 
-    pub fn update(mut self, other: AttrSet) -> AttrSet {
+    pub fn update(mut self, other: AttrSet<'vm>) -> AttrSet<'vm> {
         for (k, v) in other.data.iter() {
             self.push_attr_force(k.clone(), v.clone())
         }
         self
     }
 
-    pub fn update_rec(mut self, other: RecAttrSet) -> AttrSet {
+    pub fn update_rec(mut self, other: RecAttrSet<'vm>) -> AttrSet<'vm> {
         for (k, v) in other.data.borrow().iter() {
             self.push_attr_force(k.clone(), v.clone())
         }
         self
     }
 
-    pub fn into_inner(self) -> HashTrieMapSync<Symbol, Value> {
+    pub fn into_inner(self) -> HashTrieMapSync<Symbol, Value<'vm>> {
         self.data
     }
 
-    pub fn as_inner(&self) -> &HashTrieMapSync<Symbol, Value> {
+    pub fn as_inner(&self) -> &HashTrieMapSync<Symbol, Value<'vm>> {
         &self.data
     }
 
-    pub fn force_deep(&mut self, vm: &VM) -> Result<()> {
+    pub fn force_deep(&mut self, vm: &VM<'vm>) -> Result<()> {
         let mut map: Vec<_> = self
             .data
             .into_iter()
@@ -79,7 +79,7 @@ impl AttrSet {
     }
 }
 
-impl ToPublic for AttrSet {
+impl ToPublic for AttrSet<'_> {
     fn to_public(self, vm: &VM) -> p::Value {
         p::Value::AttrSet(p::AttrSet::new(
             self.data
@@ -91,29 +91,29 @@ impl ToPublic for AttrSet {
 }
 
 #[derive(Debug, Constructor, Clone, PartialEq)]
-pub struct RecAttrSet {
-    data: Arc<RefCell<HashTrieMapSync<Symbol, Value>>>,
+pub struct RecAttrSet<'vm> {
+    data: Arc<RefCell<HashTrieMapSync<Symbol, Value<'vm>>>>,
 }
 
-impl RecAttrSet {
-    pub fn empty() -> RecAttrSet {
+impl<'vm> RecAttrSet<'vm> {
+    pub fn empty() -> Self {
         RecAttrSet {
             data: Arc::default(),
         }
     }
 
-    pub fn push_attr_force(&mut self, sym: Symbol, val: Value) {
+    pub fn push_attr_force(&mut self, sym: Symbol, val: Value<'vm>) {
         self.data.borrow_mut().insert_mut(sym, val);
     }
 
-    pub fn push_attr(&mut self, sym: Symbol, val: Value) {
+    pub fn push_attr(&mut self, sym: Symbol, val: Value<'vm>) {
         if self.data.borrow().get(&sym).is_some() {
             todo!()
         }
         self.data.borrow_mut().insert_mut(sym, val);
     }
 
-    pub fn select(&self, sym: Symbol) -> Option<Value> {
+    pub fn select(&self, sym: Symbol) -> Option<Value<'vm>> {
         self.data.borrow().get(&sym).cloned()
     }
 
@@ -121,14 +121,14 @@ impl RecAttrSet {
         self.data.borrow().get(&sym).is_some()
     }
 
-    pub fn update(mut self, other: RecAttrSet) -> RecAttrSet {
+    pub fn update(mut self, other: RecAttrSet<'vm>) -> RecAttrSet<'vm> {
         for (k, v) in other.data.borrow().iter() {
             self.push_attr_force(k.clone(), v.clone())
         }
         self
     }
 
-    pub fn update_normal(self, other: AttrSet) -> AttrSet {
+    pub fn update_normal(self, other: AttrSet<'vm>) -> AttrSet<'vm> {
         let map = self
             .data
             .borrow()
@@ -142,15 +142,15 @@ impl RecAttrSet {
         new
     }
 
-    pub fn into_inner(self) -> HashTrieMapSync<Symbol, Value> {
+    pub fn into_inner(self) -> HashTrieMapSync<Symbol, Value<'vm>> {
         self.data.borrow().clone()
     }
 
-    pub fn from_inner(data: Arc<RefCell<HashTrieMapSync<Symbol, Value>>>) -> Self {
+    pub fn from_inner(data: Arc<RefCell<HashTrieMapSync<Symbol, Value<'vm>>>>) -> Self {
         RecAttrSet { data }
     }
 
-    pub fn force_deep(&mut self, vm: &VM) -> Result<()> {
+    pub fn force_deep(&mut self, vm: &VM<'vm>) -> Result<()> {
         let mut map: Vec<_> = self
             .data
             .borrow()
@@ -166,7 +166,7 @@ impl RecAttrSet {
     }
 }
 
-impl ToPublic for RecAttrSet {
+impl ToPublic for RecAttrSet<'_> {
     fn to_public(self, vm: &VM) -> p::Value {
         p::Value::AttrSet(p::AttrSet::new(
             self.data