feat: less clone on symbol

src/ty/internal/attrset.rs

@@ -5,15 +5,13 @@ use rpds::HashTrieMap;
 
 use crate::error::Result;
 use crate::vm::{Env, VM};
-
-use super::super::common::Symbol;
 use super::super::public as p;
 use super::{ToPublic, Value};
 
 #[repr(C)]
 #[derive(Debug, Constructor, Clone, PartialEq)]
 pub struct AttrSet<'vm> {
-    data: HashTrieMap<Symbol, Value<'vm>>,
+    data: HashTrieMap<usize, Value<'vm>>,
 }
 
 impl<'vm> AttrSet<'vm> {
@@ -23,22 +21,22 @@ impl<'vm> AttrSet<'vm> {
         }
     }
 
-    pub fn push_attr_force(&mut self, sym: Symbol, val: Value<'vm>) {
+    pub fn push_attr_force(&mut self, sym: usize, val: Value<'vm>) {
         self.data.insert_mut(sym, val);
     }
 
-    pub fn push_attr(&mut self, sym: Symbol, val: Value<'vm>) {
+    pub fn push_attr(&mut self, sym: usize, 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<'vm>> {
+    pub fn select(&self, sym: usize) -> Option<Value<'vm>> {
         self.data.get(&sym).cloned()
     }
 
-    pub fn has_attr(&self, sym: &Symbol) -> bool {
+    pub fn has_attr(&self, sym: usize) -> bool {
         self.data.get(&sym).is_some()
     }
 
@@ -70,11 +68,11 @@ impl<'vm> AttrSet<'vm> {
         self
     }
 
-    pub fn into_inner(self) -> HashTrieMap<Symbol, Value<'vm>> {
+    pub fn into_inner(self) -> HashTrieMap<usize, Value<'vm>> {
         self.data
     }
 
-    pub fn as_inner(&self) -> &HashTrieMap<Symbol, Value<'vm>> {
+    pub fn as_inner(&self) -> &HashTrieMap<usize, Value<'vm>> {
         &self.data
     }
 
@@ -98,7 +96,7 @@ impl ToPublic for AttrSet<'_> {
         p::Value::AttrSet(p::AttrSet::new(
             self.data
                 .iter()
-                .map(|(sym, value)| (sym.clone(), value.clone().to_public(vm)))
+                .map(|(&sym, value)| (vm.get_sym(sym), value.clone().to_public(vm)))
                 .collect(),
         ))
     }
@@ -116,22 +114,22 @@ impl<'vm> RecAttrSet<'vm> {
         }
     }
 
-    pub fn push_attr_force(&mut self, sym: Symbol, val: Value<'vm>) {
+    pub fn push_attr_force(&mut self, sym: usize, val: Value<'vm>) {
         self.data.insert(sym, val);
     }
 
-    pub fn push_attr(&mut self, sym: Symbol, val: Value<'vm>) {
-        if self.data.lookup(&sym).is_some() {
+    pub fn push_attr(&mut self, sym: usize, val: Value<'vm>) {
+        if self.data.lookup(sym).is_some() {
             todo!()
         }
         self.data.insert(sym, val);
     }
 
-    pub fn select(&self, sym: &Symbol) -> Option<Value<'vm>> {
+    pub fn select(&self, sym: usize) -> Option<Value<'vm>> {
         self.data.lookup(sym)
     }
 
-    pub fn has_attr(&self, sym: &Symbol) -> bool {
+    pub fn has_attr(&self, sym: usize) -> bool {
         self.data.lookup(sym).is_some()
     }
 
@@ -189,7 +187,7 @@ impl ToPublic for RecAttrSet<'_> {
                 .map
                 .borrow()
                 .iter()
-                .map(|(sym, value)| (sym.clone(), value.clone().to_public(vm)))
+                .map(|(&sym, value)| (vm.get_sym(sym), value.clone().to_public(vm)))
                 .collect(),
         ))
     }