final parser combined

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bool_expr_parser_nom"
-version = "0.1.10"
+version = "0.1.11"
 edition = "2021"
 
 [lints.rust]

src/ast.rs

@@ -74,14 +74,15 @@ impl LogicOp {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum ArrayOp {
     In,
     NotIn,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum AstNode {
+    Void,
     Variable(Atom),
     Constant(Atom),
     List(Vec<Atom>),

src/parse.rs

@@ -150,10 +150,21 @@ fn parse_logic_expr(i: &str) -> IResult<&str, AstNode> {
 }
 
 fn parse(input: &str) -> IResult<&str, Vec<AstNode>> {
-    alt((
-        many0(ws(parse_logic_expr)),
-        map(parse_compare_or_array_expr, |v| vec![v]),
-    ))(input)
+    let mut res: Vec<AstNode> = vec![];
+
+    let (i, mut head) =
+        alt((parse_logic_expr, parse_compare_or_array_expr))(input).expect("parse failed");
+
+    let (i, tail) =
+        many0(pair(ws(parse_logic_op), parse_compare_or_array_expr))(i).expect("Parse failed");
+
+    for (op, expr) in tail {
+        head = AstNode::Logic(Box::new(head.clone()), op.clone(), Box::new(expr.clone()));
+    }
+
+    res.push(head.clone());
+
+    Ok((i, res))
 }
 
 #[cfg(test)]
@@ -248,11 +259,11 @@ mod tests {
     #[test]
     fn test_more_complext_not_in() {
         assert_eq!(
-            parse_logic_expr("a=3 && c = 3 || d not in in (2,4,5)").is_ok(),
+            parse_logic_expr("a=3 && c = 3 || d not in (2,4,5)").is_ok(),
             true
         );
-        let (i, v) = parse("a=3 && c = 3 || d not in in (2,4,5)").unwrap();
-        // dbg!(i, v);
+        let (i, v) = parse("a=3 && c = 3 || d not in (2,4,5) and this<>34.43").unwrap();
+        assert_eq!(i, "");
     }
 
     #[test]