Use Engine's interner.

src/api/compile.rs

@@ -1,7 +1,6 @@
 //! Module that defines the public compilation API of [`Engine`].
 
 use crate::parser::{ParseResult, ParseState};
-use crate::types::StringsInterner;
 use crate::{Engine, OptimizationLevel, Scope, AST};
 #[cfg(feature = "no_std")]
 use std::prelude::v1::*;
@@ -222,7 +221,8 @@ impl Engine {
             scripts.as_ref(),
             self.token_mapper.as_ref().map(<_>::as_ref),
         );
-        let mut state = ParseState::new(self, scope, StringsInterner::default(), tokenizer_control);
+        let interned_strings = &mut *self.interned_strings.borrow_mut();
+        let mut state = ParseState::new(self, scope, interned_strings, tokenizer_control);
         let mut _ast = self.parse(&mut stream.peekable(), &mut state, optimization_level)?;
         #[cfg(feature = "metadata")]
         _ast.set_doc(state.tokenizer_control.borrow().global_comments.join("\n"));
@@ -295,7 +295,8 @@ impl Engine {
             self.lex_raw(&scripts, self.token_mapper.as_ref().map(<_>::as_ref));
 
         let mut peekable = stream.peekable();
-        let mut state = ParseState::new(self, scope, StringsInterner::default(), tokenizer_control);
+        let interned_strings = &mut *self.interned_strings.borrow_mut();
+        let mut state = ParseState::new(self, scope, interned_strings, tokenizer_control);
         self.parse_global_expr(&mut peekable, &mut state, |_| {}, self.optimization_level)
     }
 }

src/api/eval.rs

@@ -2,7 +2,7 @@
 
 use crate::eval::{Caches, GlobalRuntimeState};
 use crate::parser::ParseState;
-use crate::types::{dynamic::Variant, StringsInterner};
+use crate::types::dynamic::Variant;
 use crate::{
     reify, Dynamic, Engine, OptimizationLevel, Position, RhaiResult, RhaiResultOf, Scope, AST, ERR,
 };
@@ -117,20 +117,25 @@ impl Engine {
         script: &str,
     ) -> RhaiResultOf<T> {
         let scripts = [script];
-        let (stream, tokenizer_control) =
-            self.lex_raw(&scripts, self.token_mapper.as_ref().map(<_>::as_ref));
-        let mut state = ParseState::new(self, scope, StringsInterner::default(), tokenizer_control);
+        let ast = {
+            let interned_strings = &mut *self.interned_strings.borrow_mut();
 
-        // No need to optimize a lone expression
-        let ast = self.parse_global_expr(
-            &mut stream.peekable(),
-            &mut state,
-            |_| {},
-            #[cfg(not(feature = "no_optimize"))]
-            OptimizationLevel::None,
-            #[cfg(feature = "no_optimize")]
-            OptimizationLevel::default(),
-        )?;
+            let (stream, tokenizer_control) =
+                self.lex_raw(&scripts, self.token_mapper.as_ref().map(<_>::as_ref));
+
+            let mut state = ParseState::new(self, scope, interned_strings, tokenizer_control);
+
+            // No need to optimize a lone expression
+            self.parse_global_expr(
+                &mut stream.peekable(),
+                &mut state,
+                |_| {},
+                #[cfg(not(feature = "no_optimize"))]
+                OptimizationLevel::None,
+                #[cfg(feature = "no_optimize")]
+                OptimizationLevel::default(),
+            )?
+        };
 
         self.eval_ast_with_scope(scope, &ast)
     }

src/api/json.rs

@@ -3,7 +3,6 @@
 
 use crate::parser::{ParseSettingFlags, ParseState};
 use crate::tokenizer::Token;
-use crate::types::StringsInterner;
 use crate::{Engine, LexError, Map, OptimizationLevel, RhaiResultOf, Scope};
 #[cfg(feature = "no_std")]
 use std::prelude::v1::*;
@@ -117,19 +116,21 @@ impl Engine {
             },
         );
 
-        let scope = Scope::new();
-        let mut state =
-            ParseState::new(self, &scope, StringsInterner::default(), tokenizer_control);
+        let ast = {
+            let scope = Scope::new();
+            let interned_strings = &mut *self.interned_strings.borrow_mut();
+            let mut state = ParseState::new(self, &scope, interned_strings, tokenizer_control);
 
-        let ast = self.parse_global_expr(
-            &mut stream.peekable(),
-            &mut state,
-            |s| s.flags |= ParseSettingFlags::DISALLOW_UNQUOTED_MAP_PROPERTIES,
-            #[cfg(not(feature = "no_optimize"))]
-            OptimizationLevel::None,
-            #[cfg(feature = "no_optimize")]
-            OptimizationLevel::default(),
-        )?;
+            self.parse_global_expr(
+                &mut stream.peekable(),
+                &mut state,
+                |s| s.flags |= ParseSettingFlags::DISALLOW_UNQUOTED_MAP_PROPERTIES,
+                #[cfg(not(feature = "no_optimize"))]
+                OptimizationLevel::None,
+                #[cfg(feature = "no_optimize")]
+                OptimizationLevel::default(),
+            )?
+        };
 
         self.eval_ast(&ast)
     }

src/api/run.rs

@@ -2,7 +2,6 @@
 
 use crate::eval::{Caches, GlobalRuntimeState};
 use crate::parser::ParseState;
-use crate::types::StringsInterner;
 use crate::{Engine, RhaiResultOf, Scope, AST};
 #[cfg(feature = "no_std")]
 use std::prelude::v1::*;
@@ -57,10 +56,16 @@ impl Engine {
     #[inline]
     pub fn run_with_scope(&self, scope: &mut Scope, script: &str) -> RhaiResultOf<()> {
         let scripts = [script];
-        let (stream, tokenizer_control) =
-            self.lex_raw(&scripts, self.token_mapper.as_ref().map(<_>::as_ref));
-        let mut state = ParseState::new(self, scope, StringsInterner::default(), tokenizer_control);
-        let ast = self.parse(&mut stream.peekable(), &mut state, self.optimization_level)?;
+        let ast = {
+            let interned_strings = &mut *self.interned_strings.borrow_mut();
+
+            let (stream, tokenizer_control) =
+                self.lex_raw(&scripts, self.token_mapper.as_ref().map(<_>::as_ref));
+
+            let mut state = ParseState::new(self, scope, interned_strings, tokenizer_control);
+
+            self.parse(&mut stream.peekable(), &mut state, self.optimization_level)?
+        };
         self.run_ast_with_scope(scope, &ast)
     }
     /// Evaluate an [`AST`].