From c3535d06c89732a0ba4c13274702b0f48198ae79 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 8 Nov 2009 23:40:42 -0500 Subject: Redesigned the expr_t, predicate_t, query_t classes --- src/parser.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/parser.h') 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_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& original_string = NULL); }; } // namespace ledger -- cgit v1.2.3