summaryrefslogtreecommitdiff
path: root/parser.h
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2008-08-02 22:45:35 -0400
committerJohn Wiegley <johnw@newartisans.com>2008-08-02 22:45:35 -0400
commit5a90fe735772fd4d52216ae76ddad893bce177e6 (patch)
tree7f0f70fed0d3ae7deb5770a94ca451953b730625 /parser.h
parent7b3c8c03c56fa90f8e110ed14ce3af27fb49b458 (diff)
downloadfork-ledger-5a90fe735772fd4d52216ae76ddad893bce177e6.tar.gz
fork-ledger-5a90fe735772fd4d52216ae76ddad893bce177e6.tar.bz2
fork-ledger-5a90fe735772fd4d52216ae76ddad893bce177e6.zip
Moved xact_xdata_t into xact_t itself, as a set of "extended data" that might
be gathered during reporting. Removed the references to accounts and such from the mask logic, which means that the value expression "acount =~ /foo/" is needed in place of just "/foo/".
Diffstat (limited to 'parser.h')
-rw-r--r--parser.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/parser.h b/parser.h
index 6b68c41b..294d28ff 100644
--- a/parser.h
+++ b/parser.h
@@ -46,10 +46,14 @@ class expr_t::parser_t : public noncopyable
#define EXPR_PARSE_NO_ASSIGN 0x08
#define EXPR_PARSE_NO_DATES 0x10
+public:
+ typedef uint_least8_t flags_t;
+
+private:
mutable token_t lookahead;
mutable bool use_lookahead;
- token_t& next_token(std::istream& in, token_t::flags_t tflags) const
+ token_t& next_token(std::istream& in, flags_t tflags) const
{
if (use_lookahead)
use_lookahead = false;
@@ -69,10 +73,6 @@ class expr_t::parser_t : public noncopyable
use_lookahead = true;
}
-public:
- typedef uint_least8_t flags_t;
-
-private:
ptr_op_t parse_value_term(std::istream& in, const flags_t flags) const;
ptr_op_t parse_unary_expr(std::istream& in, const flags_t flags) const;
ptr_op_t parse_mul_expr(std::istream& in, const flags_t flags) const;