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

(parse): Do not balance automated entries: they are now balanced as

Browse source 
part of the entry they match.  (parse): Report the remainder of failed
balances using `entry_balance'.  This can give a much better idea of
what went wrong, especially when values are being calculated.
This commit is contained in:
John Wiegley 2006-02-20 00:04:21 +00:00
parent 8916ec2483
commit c51704a2a1
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
textual.cc
View file

@ -675,17 +675,12 @@ unsigned int textual_parser_t::parse(std::istream& in,
auto_entry_t * ae = new auto_entry_t(skip_ws(line + 1)); auto_entry_t * ae = new auto_entry_t(skip_ws(line + 1));
if (parse_transactions(in, account_stack.front(), *ae, "automated")) { if (parse_transactions(in, account_stack.front(), *ae, "automated")) {
if (ae->finalize()) {
journal->auto_entries.push_back(ae); journal->auto_entries.push_back(ae);
ae->src_idx = src_idx; ae->src_idx = src_idx;
ae->beg_pos = beg_pos; ae->beg_pos = beg_pos;
ae->beg_line = beg_line; ae->beg_line = beg_line;
ae->end_pos = in.tellg(); ae->end_pos = in.tellg();
ae->end_line = linenum; ae->end_line = linenum;
} else {
throw parse_error(path, linenum,
"Automated entry failed to balance");
}
} }
break; break;
} }
@ -778,7 +773,12 @@ unsigned int textual_parser_t::parse(std::istream& in,
} else { } else {
print_entry(std::cerr, *entry); print_entry(std::cerr, *entry);
delete entry; delete entry;
throw parse_error(path, first_line, "Entry above does not balance");
std::string msgbuf;
std::ostringstream msg(msgbuf);
msg << "Entry above does not balance; remainder is: "
<< entry_balance;
throw parse_error(path, first_line, msg.str());
} }
} else { } else {
throw parse_error(path, first_line, "Failed to parse entry"); throw parse_error(path, first_line, "Failed to parse entry");