mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-15 18:53:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't warn about redeclaration for the same var node

Browse Source 
Closes #3316
This commit is contained in:
LemonBoy 2019-09-26 17:54:45 +02:00 committed by Andrew Kelley
parent b89a09af4b
commit 2c8864f634
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/analyze.cpp
View File

@ -3676,7 +3676,7 @@ ZigVar *add_variable(CodeGen *g, AstNode *source_node, Scope *parent_scope, Buf
} }
if (search_scope != nullptr) { if (search_scope != nullptr) {
Tld *tld = find_decl(g, search_scope, name); Tld *tld = find_decl(g, search_scope, name);
if (tld != nullptr) { if (tld != nullptr && tld != src_tld) {
ErrorMsg *msg = add_node_error(g, source_node, ErrorMsg *msg = add_node_error(g, source_node,
buf_sprintf("redefinition of '%s'", buf_ptr(name))); buf_sprintf("redefinition of '%s'", buf_ptr(name)));
add_error_note(g, msg, tld->source_node, buf_sprintf("previous definition is here")); add_error_note(g, msg, tld->source_node, buf_sprintf("previous definition is here"));

8
test/stage1/behavior/usingnamespace.zig
View File

@ -12,3 +12,11 @@ test "usingnamespace inside a generic struct" {
std2.testing.expect(true); std2.testing.expect(true);
testing2.expect(true); testing2.expect(true);
} }
usingnamespace struct {
pub const foo = 42;
};
test "usingnamespace does not redeclare an imported variable" {
comptime std.testing.expect(foo == 42);
}