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

print command correctly prints amount expressions

Browse source
This commit is contained in:
John Wiegley 2010-05-07 23:16:45 -04:00
parent d0460b0692
commit 4028f0bcb4
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/expr.cc
View file

@ -39,10 +39,21 @@ namespace ledger {
void expr_t::parse(std::istream& in, const parse_flags_t& flags, void expr_t::parse(std::istream& in, const parse_flags_t& flags,
const optional<string>& original_string) const optional<string>& original_string)
{ {
base_type::parse(in, flags, original_string);
parser_t parser; parser_t parser;
istream_pos_type start_pos = in.tellg();
ptr = parser.parse(in, flags, original_string); ptr = parser.parse(in, flags, original_string);
istream_pos_type end_pos = in.tellg();
if (original_string) {
set_text(*original_string);
} else {
in.clear();
in.seekg(start_pos, std::ios::beg);
scoped_array<char> buf
(new char[static_cast<std::size_t>(end_pos - start_pos) + 1]);
in.read(buf.get(), end_pos - start_pos);
set_text(buf.get());
}
} }
void expr_t::compile(scope_t& scope) void expr_t::compile(scope_t& scope)

12
src/print.cc
View file

@ -140,9 +140,15 @@ namespace {
if (slip > 0) if (slip > 0)
out << string(slip, ' '); out << string(slip, ' ');
std::ostringstream amt_str; string amt;
report.scrub(post->amount).print(amt_str, 12, -1, true); if (post->amount_expr) {
string amt = amt_str.str(); amt = post->amount_expr->text();
} else {
std::ostringstream amt_str;
report.scrub(post->amount).print(amt_str, 12, -1, true);
amt = amt_str.str();
}
string trimmed_amt(amt); string trimmed_amt(amt);
trim_left(trimmed_amt); trim_left(trimmed_amt);
int amt_slip = (static_cast<int>(amt.length()) - int amt_slip = (static_cast<int>(amt.length()) -