optimize context requests using arc

Author: lamb

cmd/tests/command.rs

@@ -35,11 +35,11 @@ async fn test_command_eval() -> Result<(), Box<dyn std::error::Error>> {
     let mut command = new_command();
     let output = command
         .arg("eval")
-        .arg(r#"println("{string}", "Hello Basjoofan!")"#)
+        .arg(r#"println("{string}", "🍀 Hello Basjoofan!")"#)
         .output()
         .await?;
     assert!(output.status.success());
-    assert_eq!(String::from_utf8(output.stdout)?, "Hello Basjoofan!\nnull\n");
+    assert_eq!(String::from_utf8(output.stdout)?, "🍀 Hello Basjoofan!\nnull\n");
     Ok(())
 }
 

lib/src/context.rs

@@ -7,33 +7,36 @@ use std::collections::HashMap;
 use std::fmt::Display;
 use std::fmt::Formatter;
 use std::fmt::Result;
+use std::sync::Arc;
 
 #[derive(Default)]
 pub struct Context {
     inner: HashMap<String, Value>,
-    requests: HashMap<String, (String, Vec<Expr>)>,
+    requests: Arc<HashMap<String, (String, Vec<Expr>)>>,
     records: Vec<Record>,
 }
 
 impl Context {
     pub fn new() -> Self {
         Self {
             inner: HashMap::new(),
-            requests: HashMap::new(),
+            requests: Arc::new(HashMap::new()),
             records: Vec::new(),
         }
     }
 
     pub fn from(inner: HashMap<String, Value>) -> Self {
         Self {
             inner,
-            requests: HashMap::new(),
+            requests: Arc::new(HashMap::new()),
             records: Vec::new(),
         }
     }
 
     pub fn extend(&mut self, requests: HashMap<String, (String, Vec<Expr>)>) {
-        self.requests.extend(requests);
+        if let Some(inner) = Arc::get_mut(&mut self.requests) {
+            inner.extend(requests);
+        }
     }
 
     pub fn get(&self, key: &str) -> Option<&Value> {

lib/src/evaluator.rs

@@ -248,9 +248,9 @@ async fn eval_list(items: &[Expr], context: &mut Context) -> Result<Vec<Value>,
 #[cfg(test)]
 mod tests {
     use super::eval_block;
-    use crate::parser::Parser;
-    use crate::parser::Source;
     use crate::Context;
+    use crate::Parser;
+    use crate::Source;
     use crate::Value;
     use std::collections::HashMap;
 

lib/src/lexer.rs

@@ -357,7 +357,7 @@ fn test_segment() {
     assert_eq!(expect.len(), tokens.len());
     for (i, (kind, literal)) in expect.into_iter().enumerate() {
         let token = tokens.get(i).unwrap();
-        assert!(kind == token.kind);
+        assert_eq!(kind, token.kind);
         assert_eq!(literal, token.literal);
     }
 }

lib/src/lib.rs

@@ -20,8 +20,8 @@ use value::Value;
 pub use context::Context;
 pub use evaluator::eval_block;
 pub use parser::Parser;
-pub use parser::Source;
 pub use stat::Stats;
+pub use syntax::Source;
 pub use writer::Writer;
 
 #[cfg(test)]

lib/src/parser.rs

@@ -1,15 +1,10 @@
 use crate::lexer;
 use crate::Expr;
 use crate::Kind;
+use crate::Source;
 use crate::Token;
 use std::collections::HashMap;
 
-pub struct Source {
-    pub exprs: Vec<Expr>,
-    pub requests: HashMap<String, (String, Vec<Expr>)>,
-    pub tests: HashMap<String, Vec<Expr>>,
-}
-
 pub struct Parser {
     tokens: Vec<Token>,
     index: usize,

lib/src/syntax.rs

@@ -111,3 +111,9 @@ impl Debug for Expr {
         }
     }
 }
+
+pub struct Source {
+    pub exprs: Vec<Expr>,
+    pub requests: HashMap<String, (String, Vec<Expr>)>,
+    pub tests: HashMap<String, Vec<Expr>>,
+}