diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-10-28 23:46:14 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-10-28 23:46:14 -0400 |
| commit | 2b3f3e9867431174f5b5b25e47098a7218213a82 (patch) | |
| tree | a27560ebcfad59813cd5e988ffae933c1d04cec3 /src/precmd.cc | |
| parent | 375f6c257d23ac7655ce0738a72acceb78119457 (diff) | |
| parent | 52433e56e562976887325ce48a6271abb82a89aa (diff) | |
| download | fork-ledger-2b3f3e9867431174f5b5b25e47098a7218213a82.tar.gz fork-ledger-2b3f3e9867431174f5b5b25e47098a7218213a82.tar.bz2 fork-ledger-2b3f3e9867431174f5b5b25e47098a7218213a82.zip | |
Merge branch 'next'
Diffstat (limited to 'src/precmd.cc')
| -rw-r--r-- | src/precmd.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/precmd.cc b/src/precmd.cc index 1160cc64..590d2553 100644 --- a/src/precmd.cc +++ b/src/precmd.cc @@ -226,21 +226,20 @@ value_t args_command(call_scope_t& args) args.value().dump(out); out << std::endl << std::endl; - string predicate = args_to_predicate_expr(begin, end); + std::pair<expr_t, query_parser_t> info = args_to_predicate(begin, end); call_scope_t sub_args(static_cast<scope_t&>(args)); - sub_args.push_back(string_value(predicate)); + sub_args.push_back(string_value(info.first.text())); parse_command(sub_args); - if (begin != end) { + if (info.second.tokens_remaining()) { out << std::endl << _("====== Display predicate ======") << std::endl << std::endl; - predicate = args_to_predicate_expr(begin, end); - call_scope_t disp_sub_args(static_cast<scope_t&>(args)); - disp_sub_args.push_back(string_value(predicate)); + disp_sub_args.push_back + (string_value(args_to_predicate(info.second).first.text())); parse_command(disp_sub_args); } |