summaryrefslogtreecommitdiff
path: root/src/token.h
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2010-06-02 01:55:55 -0400
committerJohn Wiegley <johnw@newartisans.com>2010-06-02 01:55:55 -0400
commitcda19829bd1100d6563b48ddb121f2afc1c55d95 (patch)
tree5b6ab0d1eb7ec1b0b3eccf817678d0aa9a3feb47 /src/token.h
parent017492ef5e80003073c5d053252d4a68a44260ae (diff)
parentfb7cafa8965c89bbd66b09f827bd5989a87c983b (diff)
downloadledger-cda19829bd1100d6563b48ddb121f2afc1c55d95.tar.gz
ledger-cda19829bd1100d6563b48ddb121f2afc1c55d95.tar.bz2
ledger-cda19829bd1100d6563b48ddb121f2afc1c55d95.zip
Merge branch 'next'
Diffstat (limited to 'src/token.h')
-rw-r--r--src/token.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/token.h b/src/token.h
index 8d70996b..582373cb 100644
--- a/src/token.h
+++ b/src/token.h
@@ -124,10 +124,11 @@ struct expr_t::token_t : public noncopyable
int parse_reserved_word(std::istream& in);
void parse_ident(std::istream& in);
- void next(std::istream& in, const parse_flags_t& flags);
+ void next(std::istream& in, const parse_flags_t& flags,
+ const char expecting = '\0');
void rewind(std::istream& in);
- void unexpected();
- void expected(char wanted, char c = '\0');
+ void unexpected(const char wanted = '\0');
+ void expected(const char wanted, char c = '\0');
};
} // namespace ledger