diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-08 23:40:42 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-09 02:06:06 -0500 |
| commit | c3535d06c89732a0ba4c13274702b0f48198ae79 (patch) | |
| tree | 5a8153d4c627cc3c7eff687b50a59a1cc9c3d04a /src/parser.h | |
| parent | 523d4243e8c347cb7cbd1f68b03a5098ceb73b70 (diff) | |
| download | fork-ledger-c3535d06c89732a0ba4c13274702b0f48198ae79.tar.gz fork-ledger-c3535d06c89732a0ba4c13274702b0f48198ae79.tar.bz2 fork-ledger-c3535d06c89732a0ba4c13274702b0f48198ae79.zip | |
Redesigned the expr_t, predicate_t, query_t classes
Diffstat (limited to 'src/parser.h')
| -rw-r--r-- | src/parser.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/parser.h b/src/parser.h index 71e8d973..7a69fe08 100644 --- a/src/parser.h +++ b/src/parser.h @@ -49,10 +49,6 @@ namespace ledger { class expr_t::parser_t : public noncopyable { -public: - typedef basic_flags_t<parse_flags_enum_t, uint_least8_t> parse_flags_t; - -private: mutable token_t lookahead; mutable bool use_lookahead; @@ -101,14 +97,9 @@ public: TRACE_DTOR(parser_t); } - ptr_op_t parse(std::istream& in, - const parse_flags_t& flags = PARSE_NORMAL, - const string * original_string = NULL); - ptr_op_t parse(const string& str, - const parse_flags_t& flags = PARSE_NORMAL) { - std::istringstream stream(str); - return parse(stream, flags, &str); - } + ptr_op_t parse(std::istream& in, + const parse_flags_t& flags = PARSE_DEFAULT, + const optional<string>& original_string = NULL); }; } // namespace ledger |