diff options
| author | John Wiegley <johnw@newartisans.com> | 2012-04-26 16:39:25 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2012-04-26 16:39:25 -0500 |
| commit | 64a9b42381c26baf24e58b40f50f0b253e551811 (patch) | |
| tree | 5447a29dff64c3a8b7be8100a01bcb4a2d73b0bb /src/token.cc | |
| parent | 7cc550fc22357e2ded194d3e65287c6b3317f5ae (diff) | |
| parent | b4407c10c0071365322b2963747bf42a57fd7304 (diff) | |
| download | fork-ledger-64a9b42381c26baf24e58b40f50f0b253e551811.tar.gz fork-ledger-64a9b42381c26baf24e58b40f50f0b253e551811.tar.bz2 fork-ledger-64a9b42381c26baf24e58b40f50f0b253e551811.zip | |
Merge branch 'release/v3.0.0-20120426'
Diffstat (limited to 'src/token.cc')
| -rw-r--r-- | src/token.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/token.cc b/src/token.cc index 77092d49..e5d6b218 100644 --- a/src/token.cc +++ b/src/token.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2010, John Wiegley. All rights reserved. + * Copyright (c) 2003-2012, John Wiegley. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -415,16 +415,13 @@ void expr_t::token_t::next(std::istream& in, const parse_flags_t& pflags) try { amount_t temp; if (! temp.parse(in, parse_flags.plus_flags(PARSE_SOFT_FAIL))) { - // If the amount had no commodity, it must be an unambiguous - // variable reference - in.clear(); in.seekg(pos, std::ios::beg); if (in.fail()) throw_(parse_error, _("Failed to reset input stream")); c = static_cast<char>(in.peek()); - if (! std::isalpha(c)) + if (! std::isalpha(c) && c != '_') expected('\0', c); parse_ident(in); |