From 0940d46c0160683fb5a28f66589e53ec5b64241d Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 3 May 2017 16:13:22 -0400 Subject: add compile error for shadowing variable closes #360 --- src/analyze.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/analyze.cpp') diff --git a/src/analyze.cpp b/src/analyze.cpp index b9a5188b71..2b2c303ea8 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -2289,13 +2289,21 @@ VariableTableEntry *add_variable(CodeGen *g, AstNode *source_node, Scope *parent add_node_error(g, source_node, buf_sprintf("variable shadows type '%s'", buf_ptr(&type->name))); variable_entry->value->type = g->builtin_types.entry_invalid; - } else if (src_tld == nullptr) { - Tld *tld = find_decl(g, parent_scope, name); - if (tld) { - ErrorMsg *msg = add_node_error(g, source_node, - buf_sprintf("redefinition of '%s'", buf_ptr(name))); - add_error_note(g, msg, tld->source_node, buf_sprintf("previous definition is here")); - variable_entry->value->type = g->builtin_types.entry_invalid; + } else { + Scope *search_scope = nullptr; + if (src_tld == nullptr) { + search_scope = parent_scope; + } else if (src_tld->parent_scope != nullptr && src_tld->parent_scope->parent != nullptr) { + search_scope = src_tld->parent_scope->parent; + } + if (search_scope != nullptr) { + Tld *tld = find_decl(g, search_scope, name); + if (tld != nullptr) { + ErrorMsg *msg = add_node_error(g, source_node, + buf_sprintf("redefinition of '%s'", buf_ptr(name))); + add_error_note(g, msg, tld->source_node, buf_sprintf("previous definition is here")); + variable_entry->value->type = g->builtin_types.entry_invalid; + } } } } -- cgit v1.2.3