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.cc | |
parent | 55c7792c9329f97dd19fc5aeca466cb2de4fbf9c (diff) | |
parent | 9b396b41220646cf73fcd2a8afebcee06dde2a29 (diff) | |
download | fork-ledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.tar.gz fork-ledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.tar.bz2 fork-ledger-865c0ff828f88ed1d00eea73a3fc55b3e57d21b3.zip |
Merge branch 'next'
Diffstat (limited to 'src/parser.cc')
-rw-r--r-- | src/parser.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/parser.cc b/src/parser.cc index a6053d69..d94cf37f 100644 --- a/src/parser.cc +++ b/src/parser.cc @@ -473,8 +473,9 @@ expr_t::parser_t::parse_value_expr(std::istream& in, } expr_t::ptr_op_t -expr_t::parser_t::parse(std::istream& in, const parse_flags_t& flags, - const string * original_string) +expr_t::parser_t::parse(std::istream& in, + const parse_flags_t& flags, + const optional<string>& original_string) { try { ptr_op_t top_node = parse_value_expr(in, flags); |