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

Propagate out parsing context counts

Browse source
This commit is contained in:
John Wiegley 2012-03-01 22:09:17 -06:00
parent 4cfa4bca08
commit 7a141edb49
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/textual.cc
View file

@ -741,9 +741,12 @@ void instance_t::include_directive(char * line)
string base = (*iter).leaf();
#endif // BOOST_VERSION >= 103700
if (glob.match(base)) {
journal_t * journal = context.journal;
account_t * master = context.master;
scope_t * scope = context.scope;
journal_t * journal = context.journal;
account_t * master = context.master;
scope_t * scope = context.scope;
std::size_t& errors = context.errors;
std::size_t& count = context.count;
std::size_t& sequence = context.sequence;
context_stack.push(*iter);
@ -757,9 +760,18 @@ void instance_t::include_directive(char * line)
instance.parse();
}
catch (...) {
errors += context_stack.get_current().errors;
count += context_stack.get_current().count;
sequence += context_stack.get_current().sequence;
context_stack.pop();
throw;
}
errors += context_stack.get_current().errors;
count += context_stack.get_current().count;
sequence += context_stack.get_current().sequence;
context_stack.pop();
files_found = true;