From 0a40cca6ffe841aeb4ae5d3b9705306cd6dbf0b3 Mon Sep 17 00:00:00 2001 From: minneelyyyy Date: Tue, 22 Oct 2024 13:18:26 -0400 Subject: [PATCH] fix performance issue by using reference counting for objects --- src/executor.rs | 32 +++++++++++++++++--------------- src/function.rs | 10 ++++++---- src/lib.rs | 18 ++++++++++-------- src/parser.rs | 4 ++-- 4 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/executor.rs b/src/executor.rs index 034f3a7..3d8f4d3 100644 --- a/src/executor.rs +++ b/src/executor.rs @@ -5,6 +5,8 @@ use std::collections::HashMap; use std::fmt::Display; use std::error::Error; use std::io; +use std::rc::Rc; +use std::cell::RefCell; #[derive(Debug)] pub enum RuntimeError { @@ -49,15 +51,15 @@ where I: Iterator> { exprs: &'a mut I, - globals: &'a mut HashMap, - locals: HashMap, + globals: &'a mut HashMap>>, + locals: HashMap>>, } impl<'a, I> Executor<'a, I> where I: Iterator>, { - pub fn new(exprs: &'a mut I, globals: &'a mut HashMap) -> Self { + pub fn new(exprs: &'a mut I, globals: &'a mut HashMap>>) -> Self { Self { exprs, globals, @@ -65,27 +67,27 @@ where } } - pub fn _add_global(self, k: String, v: Object) -> Self { + pub fn _add_global(self, k: String, v: Rc>) -> Self { self.globals.insert(k, v); self } - pub fn locals(mut self, locals: HashMap) -> Self { + pub fn locals(mut self, locals: HashMap>>) -> Self { self.locals = locals; self } - pub fn add_local(mut self, k: String, v: Object) -> Self { + pub fn add_local(mut self, k: String, v: Rc>) -> Self { self.locals.insert(k, v); self } - fn _get_object(&self, ident: &String) -> Result<&Object, RuntimeError> { + fn _get_object(&self, ident: &String) -> Result<&Rc>, RuntimeError> { self.locals.get(ident).or(self.globals.get(ident)) .ok_or(RuntimeError::VariableUndefined(ident.clone())) } - fn get_object_mut(&mut self, ident: &String) -> Result<&mut Object, RuntimeError> { + fn get_object_mut(&mut self, ident: &String) -> Result<&mut Rc>, RuntimeError> { self.locals.get_mut(ident).or(self.globals.get_mut(ident)) .ok_or(RuntimeError::VariableUndefined(ident.clone())) } @@ -236,7 +238,7 @@ where Executor::new(self.exprs, &mut self.globals) .locals(self.locals.clone()) - .add_local(ident, Object::value(value, g, self.locals.to_owned())) + .add_local(ident, Rc::new(RefCell::new(Object::value(value, g, self.locals.to_owned())))) .exec(scope) } }, @@ -247,7 +249,7 @@ where let g = self.globals.clone(); Executor::new(self.exprs, &mut self.globals) .locals(self.locals.clone()) - .add_local(ident, Object::variable(*body, g, self.locals.to_owned())) + .add_local(ident, Rc::new(RefCell::new(Object::variable(*body, g, self.locals.to_owned())))) .exec(scope) } }, @@ -255,7 +257,7 @@ where let g = self.globals.clone(); Executor::new(self.exprs, &mut self.globals) .locals(self.locals.clone()) - .add_local(func.name().unwrap().to_string(), Object::function(func, g, self.locals.clone())) + .add_local(func.name().unwrap().to_string(), Rc::new(RefCell::new(Object::function(func, g, self.locals.clone())))) .exec(scope) }, ParseTree::Compose(x, y) => { @@ -292,17 +294,17 @@ where ParseTree::FunctionCall(ident, args) => { let args = args.into_iter().map(|x| Object::variable(x, self.globals.clone(), self.locals.clone())).collect(); let obj = self.get_object_mut(&ident)?; - let v = obj.eval()?; + let v = obj.borrow_mut().eval()?; match v { - Value::Function(mut f) => f.call(obj.globals(), obj.locals(), args), + Value::Function(mut f) => f.call(obj.borrow().globals(), obj.borrow().locals(), args), _ => Err(RuntimeError::FunctionUndefined(ident.clone())) } }, ParseTree::Variable(ident) => { let obj = self.get_object_mut(&ident)?; - let v = obj.eval()?; + let v = obj.borrow_mut().eval()?; Ok(v) }, @@ -350,7 +352,7 @@ where ParseTree::NonCall(name) => { let obj = self.get_object_mut(&name)?; - let v = obj.eval()?; + let v = obj.borrow_mut().eval()?; Ok(v) } diff --git a/src/function.rs b/src/function.rs index 53fa101..4290f10 100644 --- a/src/function.rs +++ b/src/function.rs @@ -1,9 +1,11 @@ +use std::cell::RefCell; use crate::parser::ParseTree; use crate::executor::{Executor, RuntimeError}; use crate::{Type, Object, Value}; use std::collections::HashMap; use std::fmt::{self, Display}; +use std::rc::Rc; #[derive(Clone, Debug, PartialEq)] pub struct FunctionType(pub Box, pub Vec); @@ -50,8 +52,8 @@ impl Function { } pub(crate) fn call(&mut self, - mut globals: HashMap, - locals: HashMap, + mut globals: HashMap>>, + locals: HashMap>>, args: Vec) -> Result { let mut tree = vec![Ok(*self.body.clone())].into_iter(); @@ -61,11 +63,11 @@ impl Function { .locals(locals.clone()); for (obj, name) in std::iter::zip(args.into_iter(), self.arg_names.clone().into_iter()) { - exec = exec.add_local(name.clone(), obj); + exec = exec.add_local(name.clone(), Rc::new(RefCell::new(obj))); } if let Some(name) = self.name().map(|x| x.to_string()) { - exec = exec.add_local(name, Object::function(self.clone(), g, locals)); + exec = exec.add_local(name, Rc::new(RefCell::new(Object::function(self.clone(), g, locals)))); } exec.next().unwrap() diff --git a/src/lib.rs b/src/lib.rs index 49cfbf8..57545fe 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -13,6 +13,8 @@ use std::fmt::Display; use std::io::BufRead; use std::fmt; use std::iter::Peekable; +use std::rc::Rc; +use std::cell::RefCell; #[derive(Clone, Debug)] pub enum Type { @@ -101,13 +103,13 @@ enum Cache { #[derive(Clone, Debug, PartialEq)] struct Object { - locals: HashMap, - globals: HashMap, + locals: HashMap>>, + globals: HashMap>>, value: Cache, } impl Object { - pub fn variable(tree: ParseTree, globals: HashMap, locals: HashMap) -> Self { + pub fn variable(tree: ParseTree, globals: HashMap>>, locals: HashMap>>) -> Self { Self { locals, globals, @@ -115,7 +117,7 @@ impl Object { } } - pub fn value(v: Value, globals: HashMap, locals: HashMap) -> Self { + pub fn value(v: Value, globals: HashMap>>, locals: HashMap>>) -> Self { Self { locals, globals, @@ -123,7 +125,7 @@ impl Object { } } - pub fn function(func: Function, globals: HashMap, locals: HashMap) -> Self { + pub fn function(func: Function, globals: HashMap>>, locals: HashMap>>) -> Self { Self { locals, globals, @@ -150,11 +152,11 @@ impl Object { } } - pub fn locals(&self) -> HashMap { + pub fn locals(&self) -> HashMap>> { self.locals.clone() } - pub fn globals(&self) -> HashMap { + pub fn globals(&self) -> HashMap>> { self.globals.clone() } } @@ -162,7 +164,7 @@ impl Object { pub struct Runtime<'a, R: BufRead> { tokenizer: Peekable>, global_types: HashMap, - globals: HashMap, + globals: HashMap>>, parser: Option>>, } diff --git a/src/parser.rs b/src/parser.rs index 3a6496a..dac0235 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -4,7 +4,7 @@ use crate::executor::Executor; use super::{Value, Type, Function, FunctionType}; use super::tokenizer::{Token, TokenizeError, Op}; -use std::borrow::{BorrowMut, Cow}; +use std::borrow::BorrowMut; use std::error; use std::collections::HashMap; use std::fmt::Display; @@ -106,7 +106,7 @@ pub(crate) struct Parser<'a, I: Iterator>> { impl<'a, I: Iterator>> Parser<'a, I> { pub fn new(tokens: &'a mut Peekable, globals: &'a mut HashMap) -> Self { Self { - tokens: tokens, + tokens, globals, locals: HashMap::new() }