From 1e883cb810a8f18df936cfb2ca13a25bbc06050d Mon Sep 17 00:00:00 2001
From: stefan-gorules <127550877+stefan-gorules@users.noreply.github.com>
Date: Wed, 26 Apr 2023 22:26:14 +0200
Subject: [PATCH] fix: unary reference in string; (#27)

---
 core/engine/src/handler/table/zen.rs |  2 +-
 core/expression/src/isolate.rs       | 40 ++++++++++++++++------------
 core/expression/tests/isolate.rs     |  2 +-
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/core/engine/src/handler/table/zen.rs b/core/engine/src/handler/table/zen.rs
index d3e32351..9418d192 100644
--- a/core/engine/src/handler/table/zen.rs
+++ b/core/engine/src/handler/table/zen.rs
@@ -104,7 +104,7 @@ impl<'a> DecisionTableHandler<'a> {
                 return None;
             }
 
-            let result = self.isolate.run(rule_value.as_str());
+            let result = self.isolate.run_unary(rule_value.as_str());
             if result.is_err() {
                 return None;
             }
diff --git a/core/expression/src/isolate.rs b/core/expression/src/isolate.rs
index 9a117374..e5e2b096 100644
--- a/core/expression/src/isolate.rs
+++ b/core/expression/src/isolate.rs
@@ -16,6 +16,7 @@ use crate::parser::error::ParserError;
 use crate::parser::{StandardParser, UnaryParser};
 
 use crate::compiler::{Compiler, CompilerError};
+use crate::lexer::token::TokenKind;
 use crate::opcodes::{Opcode, Variable};
 use crate::vm::{Scope, VMError, VM};
 
@@ -76,14 +77,6 @@ impl<'a> Isolate<'a> {
         *env = ManuallyDrop::new(new_env);
     }
 
-    pub fn run(&self, source: &'a str) -> Result<Value, IsolateError> {
-        if self.contains_ref(source) {
-            self.run_standard(source)
-        } else {
-            self.run_unary(source)
-        }
-    }
-
     fn get_bump(&self) -> &'a Bump {
         unsafe { std::mem::transmute::<&Bump, &'a Bump>(&self.bump.borrow()) }
     }
@@ -164,6 +157,8 @@ impl<'a> Isolate<'a> {
         res.try_into().map_err(|_| IsolateError::ValueCastError)
     }
 
+    /// Runs unary test
+    /// If reference identifier is present ($) it will use standard parser
     pub fn run_unary(&self, source: &'a str) -> Result<Value, IsolateError> {
         self.clear();
 
@@ -173,14 +168,29 @@ impl<'a> Isolate<'a> {
             .map_err(|source| IsolateError::LexerError { source })?;
 
         let tkn = tokens.borrow();
+        let unary_disallowed = tkn
+            .iter()
+            .any(|token| token.kind == TokenKind::Identifier && token.value == "$");
+
         let bump = self.get_bump();
+        let ast = match unary_disallowed {
+            true => {
+                let parser = StandardParser::try_new(tkn.as_ref(), bump)
+                    .map_err(|source| IsolateError::ParserError { source })?;
 
-        let parser = UnaryParser::try_new(tkn.as_ref(), bump)
-            .map_err(|source| IsolateError::ParserError { source })?;
+                parser
+                    .parse()
+                    .map_err(|source| IsolateError::ParserError { source })?
+            }
+            false => {
+                let parser = UnaryParser::try_new(tkn.as_ref(), bump)
+                    .map_err(|source| IsolateError::ParserError { source })?;
 
-        let ast = parser
-            .parse()
-            .map_err(|source| IsolateError::ParserError { source })?;
+                parser
+                    .parse()
+                    .map_err(|source| IsolateError::ParserError { source })?
+            }
+        };
 
         let compiler = Compiler::new(ast, self.bytecode.clone(), bump);
         compiler
@@ -211,8 +221,4 @@ impl<'a> Isolate<'a> {
             (*self.scopes.get()).clear();
         }
     }
-
-    fn contains_ref(&self, source: &str) -> bool {
-        source.chars().any(|c| c == '$')
-    }
 }
diff --git a/core/expression/tests/isolate.rs b/core/expression/tests/isolate.rs
index a05e22d3..b6f38f67 100644
--- a/core/expression/tests/isolate.rs
+++ b/core/expression/tests/isolate.rs
@@ -537,7 +537,7 @@ fn isolate_unary_tests() {
         isolate.set_reference(reference).unwrap();
 
         for TestCase { expr, result } in cases {
-            assert_eq!(result, isolate.run(expr).unwrap(), "{}", expr);
+            assert_eq!(result, isolate.run_unary(expr).unwrap(), "{}", expr);
         }
     }
 }