authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-03-20 15:32:13-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-03-20 15:32:13-04:00
loge1c47d6fe88bb1d79a4484e07d21f126ca9f1003
tree9fe0d27ddce80b0c37800961e394f36fe0127ac8
parentfa7c64ccd511703fef9971c4d07c447c9aeda49c

fix test regression regarding shadowing names

closes #271

5 files changed, 31 insertions(+), 11 deletions(-)

src/analyze.cpp+6-5
......@@ -2138,7 +2138,7 @@ TypeTableEntry *validate_var_type(CodeGen *g, AstNode *source_node, TypeTableEnt
21382138// Set name to nullptr to make the variable anonymous (not visible to programmer).
21392139// TODO merge with definition of add_local_var in ir.cpp
21402140VariableTableEntry *add_variable(CodeGen *g, AstNode *source_node, Scope *parent_scope, Buf *name,
2141 bool is_const, ConstExprValue *value)
2141 bool is_const, ConstExprValue *value, Tld *src_tld)
21422142{
21432143 assert(value);
21442144
......@@ -2167,9 +2167,9 @@ VariableTableEntry *add_variable(CodeGen *g, AstNode *source_node, Scope *parent
21672167 add_node_error(g, source_node,
21682168 buf_sprintf("variable shadows type '%s'", buf_ptr(&type->name)));
21692169 variable_entry->value->type = g->builtin_types.entry_invalid;
2170 } else {
2170 } else if (src_tld == nullptr) {
21712171 Tld *tld = find_decl(g, parent_scope, name);
2172 if (tld && tld->id != TldIdVar) {
2172 if (tld) {
21732173 ErrorMsg *msg = add_node_error(g, source_node,
21742174 buf_sprintf("redefinition of '%s'", buf_ptr(name)));
21752175 add_error_note(g, msg, tld->source_node, buf_sprintf("previous definition is here"));
......@@ -2263,7 +2263,8 @@ static void resolve_decl_var(CodeGen *g, TldVar *tld_var) {
22632263
22642264 ConstExprValue *init_val = init_value ? &init_value->value : create_const_runtime(type);
22652265
2266 tld_var->var = add_variable(g, source_node, tld_var->base.parent_scope, var_decl->symbol, is_const, init_val);
2266 tld_var->var = add_variable(g, source_node, tld_var->base.parent_scope, var_decl->symbol,
2267 is_const, init_val, &tld_var->base);
22672268 tld_var->var->linkage = linkage;
22682269
22692270 g->global_vars.append(tld_var);
......@@ -2653,7 +2654,7 @@ void define_local_param_variables(CodeGen *g, FnTableEntry *fn_table_entry, Vari
26532654 }
26542655
26552656 VariableTableEntry *var = add_variable(g, param_decl_node, fn_table_entry->child_scope,
2656 param_name, true, create_const_runtime(param_type));
2657 param_name, true, create_const_runtime(param_type), nullptr);
26572658 var->src_arg_index = i;
26582659 fn_table_entry->child_scope = var->child_scope;
26592660 var->shadowable = var->shadowable || is_var_args;
src/analyze.hpp+1-1
......@@ -69,7 +69,7 @@ FnTableEntry *scope_fn_entry(Scope *scope);
6969ImportTableEntry *get_scope_import(Scope *scope);
7070void init_tld(Tld *tld, TldId id, Buf *name, VisibMod visib_mod, AstNode *source_node, Scope *parent_scope);
7171VariableTableEntry *add_variable(CodeGen *g, AstNode *source_node, Scope *parent_scope, Buf *name,
72 bool is_const, ConstExprValue *init_value);
72 bool is_const, ConstExprValue *init_value, Tld *src_tld);
7373TypeTableEntry *analyze_type_expr(CodeGen *g, Scope *scope, AstNode *node);
7474FnTableEntry *create_fn(AstNode *proto_node);
7575FnTableEntry *create_fn_raw(FnInline inline_value, bool internal_linkage);
src/ir.cpp+4-4
......@@ -3171,7 +3171,7 @@ static VariableTableEntry *create_local_var(CodeGen *codegen, AstNode *node, Sco
31713171 variable_entry->value->type = codegen->builtin_types.entry_invalid;
31723172 } else {
31733173 Tld *tld = find_decl(codegen, parent_scope, name);
3174 if (tld && tld->id != TldIdVar) {
3174 if (tld != nullptr) {
31753175 ErrorMsg *msg = add_node_error(codegen, node,
31763176 buf_sprintf("redefinition of '%s'", buf_ptr(name)));
31773177 add_error_note(codegen, msg, tld->source_node, buf_sprintf("previous definition is here"));
......@@ -7897,7 +7897,7 @@ static bool ir_analyze_fn_call_inline_arg(IrAnalyze *ira, AstNode *fn_proto_node
78977897
78987898 Buf *param_name = param_decl_node->data.param_decl.name;
78997899 VariableTableEntry *var = add_variable(ira->codegen, param_decl_node,
7900 *exec_scope, param_name, true, arg_val);
7900 *exec_scope, param_name, true, arg_val, nullptr);
79017901 *exec_scope = var->child_scope;
79027902 *next_proto_i += 1;
79037903
......@@ -7954,7 +7954,7 @@ static bool ir_analyze_fn_call_generic_arg(IrAnalyze *ira, AstNode *fn_proto_nod
79547954 Buf *param_name = param_decl_node->data.param_decl.name;
79557955 if (!is_var_args) {
79567956 VariableTableEntry *var = add_variable(ira->codegen, param_decl_node,
7957 *child_scope, param_name, true, arg_val);
7957 *child_scope, param_name, true, arg_val, nullptr);
79587958 *child_scope = var->child_scope;
79597959 var->shadowable = !comptime_arg;
79607960
......@@ -8245,7 +8245,7 @@ static TypeTableEntry *ir_analyze_fn_call(IrAnalyze *ira, IrInstructionCall *cal
82458245 ConstExprValue *var_args_val = create_const_arg_tuple(ira->codegen,
82468246 first_var_arg, inst_fn_type_id.param_count);
82478247 VariableTableEntry *var = add_variable(ira->codegen, param_decl_node,
8248 impl_fn->child_scope, param_name, true, var_args_val);
8248 impl_fn->child_scope, param_name, true, var_args_val, nullptr);
82498249 impl_fn->child_scope = var->child_scope;
82508250 }
82518251 {
src/parseh.cpp+2-1
......@@ -151,7 +151,8 @@ static TldVar *create_global_var(Context *c, Buf *name, ConstExprValue *var_valu
151151 }
152152 TldVar *tld_var = allocate<TldVar>(1);
153153 parseh_init_tld(c, &tld_var->base, TldIdVar, name);
154 tld_var->var = add_variable(c->codegen, c->source_node, &c->import->decls_scope->base, name, is_const, var_value);
154 tld_var->var = add_variable(c->codegen, c->source_node, &c->import->decls_scope->base,
155 name, is_const, var_value, &tld_var->base);
155156 c->codegen->global_vars.append(tld_var);
156157 return tld_var;
157158}
test/run_tests.cpp+18
......@@ -991,6 +991,24 @@ export fn entry() -> foo {
991991}
992992 )SOURCE", 1, ".tmp_source.zig:2:1: error: variable of type 'type' must be constant");
993993
994
995 add_compile_fail_case("variables shadowing types", R"SOURCE(
996const Foo = struct {};
997const Bar = struct {};
998
999fn f(Foo: i32) {
1000 var Bar : i32 = undefined;
1001}
1002
1003export fn entry() {
1004 f(1234);
1005}
1006 )SOURCE", 4,
1007 ".tmp_source.zig:5:6: error: redefinition of 'Foo'",
1008 ".tmp_source.zig:2:1: note: previous definition is here",
1009 ".tmp_source.zig:6:5: error: redefinition of 'Bar'",
1010 ".tmp_source.zig:3:1: note: previous definition is here");
1011
9941012 add_compile_fail_case("multiple else prongs in a switch", R"SOURCE(
9951013fn f(x: u32) {
9961014 const value: bool = switch (x) {