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

Re-indent some code that was indented incorrectly

Browse source
This commit is contained in:
John Wiegley 2015-07-30 14:05:53 -07:00
parent 3d1c59aa81
commit 76f057c14c
1 changed files with 42 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/session.cc
View file

@ -127,47 +127,14 @@ std::size_t session_t::read_data(const string& master_account)
if (HANDLED(value_expr_)) if (HANDLED(value_expr_))
journal->value_expr = HANDLER(value_expr_).str(); journal->value_expr = HANDLER(value_expr_).str();
if (price_db_path) {
if (exists(*price_db_path)) {
parsing_context.push(*price_db_path);
parsing_context.get_current().journal = journal.get();
try {
if (journal->read(parsing_context) > 0)
throw_(parse_error, _("Transactions not allowed in price history file"));
}
catch (...) {
parsing_context.pop();
throw;
}
parsing_context.pop();
}
}
foreach (const path& pathname, HANDLER(file_).data_files) {
if (pathname == "-" || pathname == "/dev/stdin") {
// To avoid problems with stdin and pipes, etc., we read the entire
// file in beforehand into a memory buffer, and then parcel it out
// from there.
std::ostringstream buffer;
while (std::cin.good() && ! std::cin.eof()) {
char line[8192];
std::cin.read(line, 8192);
std::streamsize count = std::cin.gcount();
buffer.write(line, count);
}
buffer.flush();
shared_ptr<std::istream> stream(new std::istringstream(buffer.str()));
parsing_context.push(stream);
} else {
parsing_context.push(pathname);
}
if (price_db_path) {
if (exists(*price_db_path)) {
parsing_context.push(*price_db_path);
parsing_context.get_current().journal = journal.get(); parsing_context.get_current().journal = journal.get();
parsing_context.get_current().master = acct;
try { try {
xact_count += journal->read(parsing_context); if (journal->read(parsing_context) > 0)
throw_(parse_error, _("Transactions not allowed in price history file"));
} }
catch (...) { catch (...) {
parsing_context.pop(); parsing_context.pop();
@ -175,10 +142,44 @@ std::size_t session_t::read_data(const string& master_account)
} }
parsing_context.pop(); parsing_context.pop();
} }
}
DEBUG("ledger.read", "xact_count [" << xact_count foreach (const path& pathname, HANDLER(file_).data_files) {
<< "] == journal->xacts.size() [" << journal->xacts.size() << "]"); if (pathname == "-" || pathname == "/dev/stdin") {
assert(xact_count == journal->xacts.size()); // To avoid problems with stdin and pipes, etc., we read the entire
// file in beforehand into a memory buffer, and then parcel it out
// from there.
std::ostringstream buffer;
while (std::cin.good() && ! std::cin.eof()) {
char line[8192];
std::cin.read(line, 8192);
std::streamsize count = std::cin.gcount();
buffer.write(line, count);
}
buffer.flush();
shared_ptr<std::istream> stream(new std::istringstream(buffer.str()));
parsing_context.push(stream);
} else {
parsing_context.push(pathname);
}
parsing_context.get_current().journal = journal.get();
parsing_context.get_current().master = acct;
try {
xact_count += journal->read(parsing_context);
}
catch (...) {
parsing_context.pop();
throw;
}
parsing_context.pop();
}
DEBUG("ledger.read", "xact_count [" << xact_count
<< "] == journal->xacts.size() [" << journal->xacts.size() << "]");
assert(xact_count == journal->xacts.size());
if (populated_data_files) if (populated_data_files)
HANDLER(file_).data_files.clear(); HANDLER(file_).data_files.clear();