dev

izihawa · Dec 24, 2024 · a3222f5 · a3222f5
1 parent 277ac47
commit a3222f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/summa-core/src/components/query_parser/summa_ql.pest b/summa-core/src/components/query_parser/summa_ql.pest
@@ -15,8 +15,9 @@ range = ${ "[" ~ WHITE_SPACE* ~ boundary_word ~ WHITE_SPACE+ ~ ^"to" ~ WHITE_SPA
 
 field_name = @{ ASCII_ALPHA ~ (ASCII_ALPHANUMERIC | "_" | ".")* }
 word = @{ wrapped_doi | ((LETTER | NUMBER) ~ (LETTER | NUMBER | "_" | "+" | "#" | "-" | "–" | "'")*) }
+signed_word = ${ "-"? ~ word }
 
-boundary_word = _{ star | ("-"? ~ word) }
+boundary_word = _{ star | signed_word }
 phrase_internals = { (!PEEK ~ ANY)* }
 phrase = ${ PUSH(quote) ~ phrase_internals? ~ (POP | EOI) ~ ("~" ~ slop)? }
 regex_internals = ${ (!PEEK ~ ANY)* }

diff --git a/summa-core/src/components/query_parser/summa_ql.rs b/summa-core/src/components/query_parser/summa_ql.rs
@@ -562,7 +562,7 @@ impl QueryParser {
     fn parse_boundary_word(&self, field: Field, boundary_word: Pair<Rule>) -> Result<Bound<Term>, QueryParserError> {
         Ok(match boundary_word.as_rule() {
             Rule::star => Unbounded,
-            Rule::word => Included(self.compute_boundary_term(field, boundary_word.as_str())?),
+            Rule::signed_word => Included(self.compute_boundary_term(field, boundary_word.as_str())?),
             _ => unreachable!(),
         })
     }