From b4c870ace26d56983354ddfe420d9b1b9ef450ad Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 17 Feb 2012 14:30:26 -0600 Subject: Fixes for variable shadowing (25/28) --- src/textual.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/textual.cc') diff --git a/src/textual.cc b/src/textual.cc index 42845e3a..4afd5961 100644 --- a/src/textual.cc +++ b/src/textual.cc @@ -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, scope_t& scope, - account_t * master, + account_t * master_account, const path * original_file, bool strict) { @@ -1622,8 +1622,9 @@ std::size_t journal_t::parse(std::istream& in, parse_context_t context(*this, scope); context.strict = strict; - if (master || this->master) - context.state_stack.push_front(master ? master : this->master); + if (master_account || this->master) + context.state_stack.push_front(master_account ? + master_account : this->master); instance_t instance(context, in, original_file); instance.parse(); -- cgit v1.2.3