sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Join command-line arguments before handling pre-commands.

Browse source
This commit is contained in:
John Wiegley 2009-02-09 17:27:16 -04:00
parent a072b7e208
commit fd53d12bf8
1 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/precmd.cc
View file

@ -34,11 +34,29 @@
namespace ledger { namespace ledger {
namespace {
string join_args(call_scope_t& args)
{
std::ostringstream buf;
bool first = true;
for (std::size_t i = 0; i < args.size(); i++) {
if (first) {
buf << args[i];
first = false;
} else {
buf << ' ' << args[i];
}
}
return buf.str();
}
}
value_t parse_command(call_scope_t& args) value_t parse_command(call_scope_t& args)
{ {
var_t<string> arg(args, 0); string arg = join_args(args);
if (arg.empty()) {
if (! arg) {
throw std::logic_error("Usage: parse TEXT"); throw std::logic_error("Usage: parse TEXT");
return 1L; return 1L;
} }
@ -71,22 +89,9 @@ value_t parse_command(call_scope_t& args)
value_t eval_command(call_scope_t& args) value_t eval_command(call_scope_t& args)
{ {
std::ostringstream buf;
bool first = true;
for (std::size_t i = 0; i < args.size(); i++) {
if (first) {
buf << args[i];
first = false;
} else {
buf << ' ' << args[i];
}
}
report_t& report(find_scope<report_t>(args)); report_t& report(find_scope<report_t>(args));
expr_t expr(join_args(args));
expr_t expr(buf.str()); value_t result(expr.calc(args).strip_annotations(report.what_to_keep()));
value_t result(expr.calc(args).strip_annotations(report.what_to_keep()));
if (! result.is_null()) if (! result.is_null())
report.output_stream << result << std::endl; report.output_stream << result << std::endl;
@ -96,9 +101,8 @@ value_t eval_command(call_scope_t& args)
value_t format_command(call_scope_t& args) value_t format_command(call_scope_t& args)
{ {
var_t<string> arg(args, 0); string arg = join_args(args);
if (arg.empty()) {
if (! arg) {
throw std::logic_error("Usage: format TEXT"); throw std::logic_error("Usage: format TEXT");
return 1L; return 1L;
} }
@ -106,7 +110,7 @@ value_t format_command(call_scope_t& args)
report_t& report(find_scope<report_t>(args)); report_t& report(find_scope<report_t>(args));
std::ostream& out(report.output_stream); std::ostream& out(report.output_stream);
format_t fmt(*arg); format_t fmt(arg);
fmt.dump(out); fmt.dump(out);
return 0L; return 0L;
@ -114,9 +118,8 @@ value_t format_command(call_scope_t& args)
value_t period_command(call_scope_t& args) value_t period_command(call_scope_t& args)
{ {
var_t<string> arg(args, 0); string arg = join_args(args);
if (arg.empty()) {
if (! arg) {
throw std::logic_error("Usage: period TEXT"); throw std::logic_error("Usage: period TEXT");
return 1L; return 1L;
} }
@ -124,7 +127,7 @@ value_t period_command(call_scope_t& args)
report_t& report(find_scope<report_t>(args)); report_t& report(find_scope<report_t>(args));
std::ostream& out(report.output_stream); std::ostream& out(report.output_stream);
interval_t interval(*arg); interval_t interval(arg);
if (! is_valid(interval.begin)) { if (! is_valid(interval.begin)) {
out << "Time period has no beginning." << std::endl; out << "Time period has no beginning." << std::endl;