sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve parsing of 'expr' query terms

Browse source 
Fixes #157 / 9DF85DF2-4BF5-4931-A30C-2592A10BB5C0
This commit is contained in:
John Wiegley 2010-06-01 17:32:41 -04:00
parent 6512201292
commit d19745afde
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/query.cc
View file

@ -55,8 +55,9 @@ query_t::lexer_t::token_t query_t::lexer_t::next_token()
if (consume_next_arg) { if (consume_next_arg) {
consume_next_arg = false; consume_next_arg = false;
token_t tok(token_t::TERM, string(arg_i, arg_end));
arg_i = arg_end; arg_i = arg_end;
return token_t(token_t::TERM, (*begin).as_string()); return tok;
} }
resume: resume:
@ -70,23 +71,25 @@ query_t::lexer_t::token_t query_t::lexer_t::next_token()
return next_token(); return next_token();
goto resume; goto resume;
case '\'':
case '/': { case '/': {
string pat; string pat;
bool found_end_slash = false; char closing = *arg_i;
bool found_closing = false;
for (++arg_i; arg_i != arg_end; ++arg_i) { for (++arg_i; arg_i != arg_end; ++arg_i) {
if (*arg_i == '\\') { if (*arg_i == '\\') {
if (++arg_i == arg_end) if (++arg_i == arg_end)
throw_(parse_error, _("Unexpected '\\' at end of pattern")); throw_(parse_error, _("Unexpected '\\' at end of pattern"));
} }
else if (*arg_i == '/') { else if (*arg_i == closing) {
++arg_i; ++arg_i;
found_end_slash = true; found_closing = true;
break; break;
} }
pat.push_back(*arg_i); pat.push_back(*arg_i);
} }
if (! found_end_slash) if (! found_closing)
throw_(parse_error, _("Expected '/' at end of pattern")); throw_(parse_error, _("Expected '%1' at end of pattern") << closing);
if (pat.empty()) if (pat.empty())
throw_(parse_error, _("Match pattern is empty")); throw_(parse_error, _("Match pattern is empty"));