langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 'escaped' parser for empty string

Browse Source 
Fix a bug where 'escaped' parsers (nom) accepted the empty
string by wrapping them in 'verify' parsers.
This commit is contained in:
RumovZ 2020-11-14 18:28:24 +01:00
parent 0cff65e5a8
commit b186e61e54
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rslib/src/search/parser.rs
View File

@ -11,7 +11,7 @@ use nom::{
branch::alt, branch::alt,
bytes::complete::{escaped, is_not, tag}, bytes::complete::{escaped, is_not, tag},
character::complete::{anychar, char, none_of, one_of}, character::complete::{anychar, char, none_of, one_of},
combinator::{all_consuming, map, map_res}, combinator::{all_consuming, map, map_res, verify},
sequence::{delimited, preceded, separated_pair}, sequence::{delimited, preceded, separated_pair},
{multi::many0, IResult}, {multi::many0, IResult},
}; };
@ -220,7 +220,10 @@ fn search_node_for_text(s: &str) -> ParseResult<SearchNode> {
/// Unquoted text, terminated by whitespace or unescaped ", ( or ) /// Unquoted text, terminated by whitespace or unescaped ", ( or )
fn unquoted_term(s: &str) -> IResult<&str, Node> { fn unquoted_term(s: &str) -> IResult<&str, Node> {
map_res( map_res(
verify(
escaped(is_not("\"() \u{3000}\\"), '\\', none_of(" \u{3000}")), escaped(is_not("\"() \u{3000}\\"), '\\', none_of(" \u{3000}")),
|s: &str| !s.is_empty(),
),
|text: &str| -> ParseResult<Node> { |text: &str| -> ParseResult<Node> {
Ok(if text.eq_ignore_ascii_case("or") { Ok(if text.eq_ignore_ascii_case("or") {
Node::Or Node::Or
@ -246,14 +249,19 @@ fn quoted_term_str(s: &str) -> IResult<&str, &str> {
/// Quoted text, terminated by a non-escaped double quote /// Quoted text, terminated by a non-escaped double quote
fn quoted_term_inner(s: &str) -> IResult<&str, &str> { fn quoted_term_inner(s: &str) -> IResult<&str, &str> {
escaped(is_not(r#""\"#), '\\', anychar)(s) verify(escaped(is_not(r#""\"#), '\\', anychar), |s: &str| {
!s.is_empty()
})(s)
} }
/// eg deck:"foo bar" - quotes must come after the : /// eg deck:"foo bar" - quotes must come after the :
fn partially_quoted_term(s: &str) -> IResult<&str, Node> { fn partially_quoted_term(s: &str) -> IResult<&str, Node> {
map_res( map_res(
separated_pair( separated_pair(
verify(
escaped(is_not("\"(): \u{3000}\\"), '\\', none_of(": \u{3000}")), escaped(is_not("\"(): \u{3000}\\"), '\\', none_of(": \u{3000}")),
|s: &str| !s.is_empty(),
),
char(':'), char(':'),
quoted_term_str, quoted_term_str,
), ),