fix: ignore comments when parsing Expression. (#23)

* fix: ignore comments when parsing `Expression`. This commit fixes the incorrect filter when iterating over the pairs provided to the `parse` function for `Expression`. Fixes #21. * Update wdl-ast/CHANGELOG.md Co-authored-by: Clay McLeod <3411613+claymcleod@users.noreply.github.com> --------- Co-authored-by: Clay McLeod <3411613+claymcleod@users.noreply.github.com>
stjude-rust-labs · May 1, 2024 · b3d1106 · b3d1106
1 parent 9847e22
commit b3d1106
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/wdl-ast/CHANGELOG.md b/wdl-ast/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* Fix ignoring comments in expressions ([#23](https://github.com/stjude-rust-labs/wdl/pull/23)).
+
 ## 0.1.0 — 12-17-2023
 
 ### Added

diff --git a/wdl-ast/src/v1/document/expression.rs b/wdl-ast/src/v1/document/expression.rs
@@ -197,8 +197,10 @@ fn parse<'a, P: Iterator<Item = pest::iterators::Pair<'a, grammar::v1::Rule>>>(
     pairs: P,
 ) -> Result<Expression> {
     let pairs = pairs.filter(|node| {
-        !matches!(node.as_rule(), wdl_grammar::v1::Rule::WHITESPACE)
-            && !matches!(node.as_rule(), wdl_grammar::v1::Rule::WHITESPACE)
+        !matches!(
+            node.as_rule(),
+            wdl_grammar::v1::Rule::WHITESPACE | wdl_grammar::v1::Rule::COMMENT
+        )
     });
 
     PRATT_PARSER
@@ -534,4 +536,20 @@ mod tests {
             ))))
         );
     }
+
+    #[test]
+    fn it_ignores_comments_and_whitespace() {
+        let expr = wdl_macros::test::valid_node!(
+            "true \n # comment1 \n && \n # comment2 \n false",
+            expression,
+            Expression
+        );
+        assert_eq!(
+            expr,
+            Expression::And(
+                Expression::Literal(Literal::Boolean(true)).into(),
+                Expression::Literal(Literal::Boolean(false)).into()
+            )
+        );
+    }
 }
diff --git a/wdl-ast/src/v1/document/workflow/execution/statement/call/body.rs b/wdl-ast/src/v1/document/workflow/execution/statement/call/body.rs
@@ -73,10 +73,7 @@ impl TryFrom<Pair<'_, grammar::v1::Rule>> for Body {
         for node in nodes {
             let inner = node
                 .into_inner()
-                .filter(|node| {
-                    !matches!(node.as_rule(), Rule::WHITESPACE)
-                        && !matches!(node.as_rule(), Rule::COMMENT)
-                })
+                .filter(|node| !matches!(node.as_rule(), Rule::WHITESPACE | Rule::COMMENT))
                 .collect::<Vec<_>>();
 
             if inner.len() != 1 && inner.len() != 2 {