feat: less clone on symbol

This commit is contained in:
2025-05-15 18:19:16 +08:00
parent 3e7a8a1c05
commit 864be73e77
12 changed files with 195 additions and 183 deletions

View File

@@ -3,13 +3,12 @@ use std::rc::Rc;
use rpds::HashTrieMap;
use crate::ty::common::Symbol;
use crate::ty::internal::Value;
#[derive(Debug, Default, PartialEq)]
pub struct Env<'vm> {
last: RefCell<Option<Rc<Env<'vm>>>>,
pub map: RefCell<HashTrieMap<Symbol, Value<'vm>>>,
pub map: RefCell<HashTrieMap<usize, Value<'vm>>>,
}
impl Clone for Env<'_> {
@@ -31,15 +30,15 @@ impl<'vm> Env<'vm> {
Env::default()
}
pub fn lookup(&self, symbol: &Symbol) -> Option<Value<'vm>> {
self.map.borrow().get(symbol).cloned()
pub fn lookup(&self, symbol: usize) -> Option<Value<'vm>> {
self.map.borrow().get(&symbol).cloned()
}
pub fn insert(&self, symbol: Symbol, value: Value<'vm>) {
pub fn insert(&self, symbol: usize, value: Value<'vm>) {
self.map.borrow_mut().insert_mut(symbol, value);
}
pub fn enter(&self, new: HashTrieMap<Symbol, Value<'vm>>) {
pub fn enter(&self, new: HashTrieMap<usize, Value<'vm>>) {
let mut map = self.map.borrow().clone();
for (k, v) in new.iter() {
map.insert_mut(k.clone(), v.clone());