Allow Not operands in Or expressions (#688)

CHANGELOG.md

@@ -7,11 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added 
+### Added
 
 * #687 Allow multi-field queries in `frequency` command
 
 
+### Fixed
+
+* #688 Allow `Not` operands in `Or` expressions
+
+
 ## [0.18.0] - 2023-07-27
 
 ### Added

pica-matcher/src/field_matcher.rs

@@ -610,6 +610,7 @@ fn parse_field_matcher_or(i: &[u8]) -> ParseResult<FieldMatcher> {
             ws(parse_field_matcher_and),
             ws(parse_field_matcher_cardinality),
             ws(parse_field_matcher_singleton),
+            ws(parse_field_matcher_not),
             ws(parse_field_matcher_exists),
         )),
         many1(preceded(
@@ -619,6 +620,7 @@ fn parse_field_matcher_or(i: &[u8]) -> ParseResult<FieldMatcher> {
                 ws(parse_field_matcher_and),
                 ws(parse_field_matcher_cardinality),
                 ws(parse_field_matcher_singleton),
+                ws(parse_field_matcher_not),
                 ws(parse_field_matcher_exists),
             ))),
         )),

pica-matcher/tests/field_matcher.rs

@@ -419,5 +419,17 @@ fn field_matcher_composite_or() -> anyhow::Result<()> {
         &options
     ));
 
+    let matcher =
+        FieldMatcher::new("!014A.x? || 013A{#a == 2 && a == '1'}")?;
+    let options = MatcherOptions::default();
+
+    assert!(matcher.is_match(
+        vec![
+            &FieldMut::new("012A", None, vec![('0', "abc")]),
+            &FieldMut::new("013A", None, vec![('a', "1"), ('a', "2")]),
+        ],
+        &options
+    ));
+
     Ok(())
 }

pica-matcher/tests/subfield_matcher.rs

@@ -721,6 +721,21 @@ fn subfield_matcher_or() -> anyhow::Result<()> {
     assert!(!matcher
         .is_match(&SubfieldRef::from_bytes(b"\x1fabcbc")?, &options));
 
+    // or
+    let matcher = SubfieldMatcher::new("!a? || b == 'x'")?;
+    let options = MatcherOptions::default();
+
+    assert!(!matcher
+        .is_match(&SubfieldRef::from_bytes(b"\x1faabab")?, &options));
+
+    assert!(matcher.is_match(
+        vec![
+            &SubfieldRef::from_bytes(b"\x1fabccd")?,
+            &SubfieldRef::from_bytes(b"\x1fbx")?
+        ],
+        &options
+    ));
+
     // not
     let matcher = SubfieldMatcher::new("a == 'bcd' || !(a != 'def')")?;
     let options = MatcherOptions::default();