diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-09 13:25:45 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-09 13:25:45 -0500 |
| commit | 865c0ff828f88ed1d00eea73a3fc55b3e57d21b3 (patch) | |
| tree | 5acdfae32811b25fb46271bf349a216bea41fddb /src/parser.h | |
| parent | 55c7792c9329f97dd19fc5aeca466cb2de4fbf9c (diff) | |
| parent | 9b396b41220646cf73fcd2a8afebcee06dde2a29 (diff) | |
| download | ledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.tar.gz ledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.tar.bz2 ledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.zip | |
Merge branch 'next'
Diffstat (limited to 'src/parser.h')
| -rw-r--r-- | src/parser.h | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/parser.h b/src/parser.h index 9c80cf38..7a69fe08 100644 --- a/src/parser.h +++ b/src/parser.h @@ -38,10 +38,6 @@ * @author John Wiegley * * @ingroup expr - * - * @brief Brief - * - * Long. */ #ifndef _PARSER_H #define _PARSER_H @@ -51,17 +47,8 @@ namespace ledger { -/** - * @brief Brief - * - * Long. - */ 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; @@ -110,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 |