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

Fixes for variable shadowing (25/28)

Browse source
This commit is contained in:
John Wiegley 2012-02-17 14:30:26 -06:00
parent ed6df84473
commit b4c870ace2
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/textual.cc
View file

@ -1614,7 +1614,7 @@ expr_t::ptr_op_t instance_t::lookup(const symbol_t::kind_t kind,
std::size_t journal_t::parse(std::istream& in, std::size_t journal_t::parse(std::istream& in,
scope_t& scope, scope_t& scope,
account_t * master, account_t * master_account,
const path * original_file, const path * original_file,
bool strict) bool strict)
{ {
@ -1622,8 +1622,9 @@ std::size_t journal_t::parse(std::istream& in,
parse_context_t context(*this, scope); parse_context_t context(*this, scope);
context.strict = strict; context.strict = strict;
if (master || this->master) if (master_account || this->master)
context.state_stack.push_front(master ? master : this->master); context.state_stack.push_front(master_account ?
master_account : this->master);
instance_t instance(context, in, original_file); instance_t instance(context, in, original_file);
instance.parse(); instance.parse();