summaryrefslogtreecommitdiff
path: root/src/token.cc
diff options
context:
space:
mode:
authorCraig Earls <enderw88@gmail.com>2014-04-08 09:20:29 -0700
committerCraig Earls <enderw88@gmail.com>2014-04-08 09:20:29 -0700
commit7faaeb301fe524422c694e54fa36248ffedfa9b8 (patch)
tree633c370e2f51c1396d8f7acaa074dab7489c712d /src/token.cc
parent69ae25eb630733657d213c3cd6c652506b9ccf27 (diff)
parentfa641c581c3e2724d61fecd28fdb70f3dbb1beec (diff)
downloadfork-ledger-7faaeb301fe524422c694e54fa36248ffedfa9b8.tar.gz
fork-ledger-7faaeb301fe524422c694e54fa36248ffedfa9b8.tar.bz2
fork-ledger-7faaeb301fe524422c694e54fa36248ffedfa9b8.zip
Merge commit 'fa641c581c3e2724d61fecd28fdb70f3dbb1beec'
Diffstat (limited to 'src/token.cc')
-rw-r--r--src/token.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/token.cc b/src/token.cc
index 6ca649bb..aa78cd5a 100644
--- a/src/token.cc
+++ b/src/token.cc
@@ -522,7 +522,8 @@ void expr_t::token_t::expected(const char wanted, char c)
void expr_t::token_t::expected(const kind_t wanted)
{
try {
- if (wanted == '\0' || wanted == -1)
+ if (wanted == expr_t::token_t::ERROR ||
+ wanted == expr_t::token_t::UNKNOWN)
throw_(parse_error, _f("Invalid token '%1%'") % *this);
else
throw_(parse_error,