summaryrefslogtreecommitdiff
path: root/src/query.h
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2009-11-16 00:15:25 -0500
committerJohn Wiegley <johnw@newartisans.com>2009-11-16 00:15:25 -0500
commit6b557f810e1c6eb2dcd8a24eeeacfcf9cc8210e3 (patch)
tree52b5e0dfa040fd878ac4817a0fd49cee7c6f1688 /src/query.h
parentbadbeb545b9e700e6656dfbc348bfe1387cb2ffa (diff)
parentb2c426abaed18e0784e39f804dcae0324e21f32f (diff)
downloadfork-ledger-6b557f810e1c6eb2dcd8a24eeeacfcf9cc8210e3.tar.gz
fork-ledger-6b557f810e1c6eb2dcd8a24eeeacfcf9cc8210e3.tar.bz2
fork-ledger-6b557f810e1c6eb2dcd8a24eeeacfcf9cc8210e3.zip
Merge branch 'next'
Diffstat (limited to 'src/query.h')
-rw-r--r--src/query.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/query.h b/src/query.h
index 73639263..43db60a6 100644
--- a/src/query.h
+++ b/src/query.h
@@ -61,6 +61,7 @@ public:
string::const_iterator arg_end;
bool consume_whitespace;
+ bool consume_next_arg;
public:
struct token_t
@@ -175,7 +176,9 @@ public:
lexer_t(value_t::sequence_t::const_iterator _begin,
value_t::sequence_t::const_iterator _end)
- : begin(_begin), end(_end), consume_whitespace(false)
+ : begin(_begin), end(_end),
+ consume_whitespace(false),
+ consume_next_arg(false)
{
TRACE_CTOR(lexer_t, "");
assert(begin != end);
@@ -186,6 +189,7 @@ public:
: begin(lexer.begin), end(lexer.end),
arg_i(lexer.arg_i), arg_end(lexer.arg_end),
consume_whitespace(lexer.consume_whitespace),
+ consume_next_arg(lexer.consume_next_arg),
token_cache(lexer.token_cache)
{
TRACE_CTOR(lexer_t, "copy");