from trait impl so i can have easier context hashmap

Cargo.toml

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

src/ast.rs

@@ -3,6 +3,8 @@ use std::str::FromStr;
 
 use chrono::NaiveDate;
 
+use crate::parse::parse_atom;
+
 #[derive(Debug, Clone)]
 pub enum Atom {
     String(String),
@@ -63,6 +65,16 @@ impl fmt::Display for Atom {
     }
 }
 
+impl<'a> From<&'a str> for Atom {
+    fn from(val: &'a str) -> Self {
+        let res = parse_atom(val);
+        if let Ok((i, out)) = res {
+            return out;
+        }
+        Atom::String(val.into())
+    }
+}
+
 #[derive(Debug, Clone, PartialEq)]
 pub enum ComparisonOp {
     Eq,

src/parse.rs

@@ -81,7 +81,7 @@ fn parse_variable(i: &str) -> IResult<&str, Atom> {
     map(parser, |v: &str| Atom::Variable(v.to_string()))(i)
 }
 
-fn parse_atom(i: &str) -> IResult<&str, Atom> {
+pub fn parse_atom(i: &str) -> IResult<&str, Atom> {
     alt((
         parse_date,
         parse_string,

tests/parser_test.rs

@@ -7,7 +7,17 @@ use chrono::NaiveDate;
 /// library tests for public functions to parse and then evaluate
 
 #[test]
-fn test_parsing() {}
+fn test_parsing() {
+    let (i, expr) = parse("!(a=b and c=d) and z=3").unwrap();
+    assert_eq!(
+        true,
+        eval(
+            &expr,
+            &HashMap::from([("a", "d".into()), ("c", "b".into()), ("z", "3".into()),])
+        )
+        .unwrap()
+    );
+}
 
 #[test]
 fn test_evaluation() {