summaryrefslogtreecommitdiff
path: root/src/token.h
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2010-05-22 18:45:42 -0400
committerJohn Wiegley <johnw@newartisans.com>2010-05-22 21:35:03 -0400
commita3482606dc33b88d2ae661e49c6b15b902497421 (patch)
tree19d3946e11d0fd8fe0d72859d5bfb3f0e66e7c07 /src/token.h
parent3e1ec40551184010d6ff3272d68b3ff17ff1ad26 (diff)
downloadfork-ledger-a3482606dc33b88d2ae661e49c6b15b902497421.tar.gz
fork-ledger-a3482606dc33b88d2ae661e49c6b15b902497421.tar.bz2
fork-ledger-a3482606dc33b88d2ae661e49c6b15b902497421.zip
Improved error reporting in the expression parser
Fixes 15A80F68-F233-49D9-AF0C-9908BB6903BA
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