diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-02 01:55:55 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-02 01:55:55 -0400 |
| commit | cda19829bd1100d6563b48ddb121f2afc1c55d95 (patch) | |
| tree | 5b6ab0d1eb7ec1b0b3eccf817678d0aa9a3feb47 /src/parser.h | |
| parent | 017492ef5e80003073c5d053252d4a68a44260ae (diff) | |
| parent | fb7cafa8965c89bbd66b09f827bd5989a87c983b (diff) | |
| download | fork-ledger-cda19829bd1100d6563b48ddb121f2afc1c55d95.tar.gz fork-ledger-cda19829bd1100d6563b48ddb121f2afc1c55d95.tar.bz2 fork-ledger-cda19829bd1100d6563b48ddb121f2afc1c55d95.zip | |
Merge branch 'next'
Diffstat (limited to 'src/parser.h')
| -rw-r--r-- | src/parser.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/parser.h b/src/parser.h index 5eba4ffd..aab48830 100644 --- a/src/parser.h +++ b/src/parser.h @@ -52,11 +52,12 @@ class expr_t::parser_t : public noncopyable mutable token_t lookahead; mutable bool use_lookahead; - token_t& next_token(std::istream& in, const parse_flags_t& tflags) const { + token_t& next_token(std::istream& in, const parse_flags_t& tflags, + const char expecting = '\0') const { if (use_lookahead) use_lookahead = false; else - lookahead.next(in, tflags); + lookahead.next(in, tflags, expecting); return lookahead; } |