fixing more edge case bugs for parsing whitespaced scopes and stuff

.vimspector.json

@@ -6,7 +6,7 @@
       "configuration": {
         "request": "launch",
         "program": "${workspaceRoot}/target/debug/deps/parser_test-ce9cb22a64720f6c",
-        "args": ["test", "scoped_test_case"]
+        "args": ["test", "scopes_bug_test"]
       }
     }
   }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bool_expr_parser_nom"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2021"
 authors = ["Nikolajus Krauklis <[email protected]>"]
 

src/ast.rs

@@ -1,4 +1,5 @@
 use core::fmt;
+use std::str::FromStr;
 
 use chrono::NaiveDate;
 
@@ -73,7 +74,7 @@ pub enum ComparisonOp {
 }
 
 impl ComparisonOp {
-    pub fn from_str(expr: &str) -> Self {
+    pub fn build_from_str(expr: &str) -> Self {
         match expr {
             "==" | "=" => ComparisonOp::Eq,
             ">" => ComparisonOp::More,
@@ -105,7 +106,7 @@ pub enum LogicOp {
 }
 
 impl LogicOp {
-    pub fn from_str(i: &str) -> Self {
+    pub fn build_from_str(i: &str) -> Self {
         match i.to_lowercase().as_str() {
             "and" | "&&" => LogicOp::And,
             "or" | "||" => LogicOp::Or,

src/parse.rs

@@ -227,7 +227,7 @@ fn parse_expr(input: &str) -> IResult<&str, AstNode> {
 }
 
 pub fn parse(i: &str) -> IResult<&str, AstNode> {
-    alt((parse_parenthesized_expr, parse_expr))(i)
+    alt((ws(parse_expr), ws(parse_parenthesized_expr)))(i)
 }
 
 mod tests {

tests/parser_test.rs

@@ -11,7 +11,8 @@ fn test_parsing() {}
 
 #[test]
 fn test_evaluation() {
-    let rule = r###"accountRole in (Admin,admin,"Admin/Order Manager")
+    let rule = r###"
+accountRole in (Admin,admin,"Admin/Order Manager")
     and upper(account_country_code) in (LT , NL, DE, GB, US)
     and account_uuid in ("543987b0-e69f-41ec-9a68-cfc5cfb15afe", "6133b8d6-4078-4270-9a68-fa0ac78bf512")
     and accountType in ("Some Corporate & Managament Type", Corporate , Managament)
@@ -39,7 +40,7 @@ fn test_evaluation() {
 
 #[test]
 fn scoped_test_case() {
-    let rule = r###"accountRole in (Admin, "Admin/Order Manager") and
+    let rule = r###"(accountRole in (Admin, "Admin/Order Manager")) and
     ((lower(account_country_code) == lt or account_uuid = 32434) and accountType="Some Corporate & Managament Type") and user_id == 2032312"###;
 
     let context = HashMap::from([
@@ -61,3 +62,37 @@ fn scoped_test_case() {
     assert_eq!(val, true);
     assert_eq!(i, ""); // empty remainder of parsed string
 }
+
+#[test]
+fn scopes_bug_test() {
+    let rule = "(a=1 or b=2) and ((c=3 or d=4) and e=5)";
+    let context = HashMap::from([
+        ("a", Atom::Number(1)),
+        ("b", Atom::Number(2)),
+        ("c", Atom::Number(3)),
+        ("d", Atom::Number(4)),
+        ("e", Atom::Number(5)),
+    ]);
+    let (i, expr) = parse(rule).unwrap();
+    let val = eval(&expr, &context).unwrap();
+    assert_eq!(val, true);
+    assert_eq!(i, "");
+}
+
+#[test]
+fn scopes_bug_with_new_lines_around_test() {
+    let rule = r###"
+            (a=1 or b=2) and ((c=3 or d=4) and e=5)
+"###;
+    let context = HashMap::from([
+        ("a", Atom::Number(1)),
+        ("b", Atom::Number(2)),
+        ("c", Atom::Number(3)),
+        ("d", Atom::Number(4)),
+        ("e", Atom::Number(5)),
+    ]);
+    let (i, expr) = parse(rule).unwrap();
+    let val = eval(&expr, &context).unwrap();
+    assert_eq!(val, true);
+    assert_eq!(i, "");
+}