authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-08-28 10:17:47-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-08-28 13:28:34-04:00
log6a6e2cd64f3ebb1919dd0ac53d8a1f29c56e6ec2
tree9d698bc9013ee12ba43c83483d2cac4b63b26d7a
parentf30aa25cbf9c9a415963b4ea69d7efa09237a704

AstGen: allow locals with same name as primitives with `@""` syntax

This makes local names follow the same rule as declaration names.

3 files changed, 41 insertions(+), 29 deletions(-)

src/AstGen.zig+35-22
......@@ -2385,7 +2385,7 @@ fn varDecl(
23852385 }
23862386 const ident_name = try astgen.identAsString(name_token);
23872387
2388 try astgen.detectLocalShadowing(scope, ident_name, name_token);
2388 try astgen.detectLocalShadowing(scope, ident_name, name_token, ident_name_raw);
23892389
23902390 if (var_decl.ast.init_node == 0) {
23912391 return astgen.failNode(node, "variables must be initialized", .{});
......@@ -2952,12 +2952,13 @@ fn fnDecl(
29522952 } else false;
29532953
29542954 const param_name: u32 = if (param.name_token) |name_token| blk: {
2955 if (mem.eql(u8, "_", tree.tokenSlice(name_token)))
2955 const name_bytes = tree.tokenSlice(name_token);
2956 if (mem.eql(u8, "_", name_bytes))
29562957 break :blk 0;
29572958
29582959 const param_name = try astgen.identAsString(name_token);
29592960 if (!is_extern) {
2960 try astgen.detectLocalShadowing(params_scope, param_name, name_token);
2961 try astgen.detectLocalShadowing(params_scope, param_name, name_token, name_bytes);
29612962 }
29622963 break :blk param_name;
29632964 } else if (!is_extern) {
......@@ -5035,7 +5036,7 @@ fn ifExpr(
50355036 const token_name_str = tree.tokenSlice(token_name_index);
50365037 if (mem.eql(u8, "_", token_name_str))
50375038 break :s &then_scope.base;
5038 try astgen.detectLocalShadowing(&then_scope.base, ident_name, token_name_index);
5039 try astgen.detectLocalShadowing(&then_scope.base, ident_name, token_name_index, token_name_str);
50395040 payload_val_scope = .{
50405041 .parent = &then_scope.base,
50415042 .gen_zir = &then_scope,
......@@ -5054,11 +5055,12 @@ fn ifExpr(
50545055 .optional_payload_unsafe_ptr
50555056 else
50565057 .optional_payload_unsafe;
5057 if (mem.eql(u8, "_", tree.tokenSlice(ident_token)))
5058 const ident_bytes = tree.tokenSlice(ident_token);
5059 if (mem.eql(u8, "_", ident_bytes))
50585060 break :s &then_scope.base;
50595061 const payload_inst = try then_scope.addUnNode(tag, cond.inst, node);
50605062 const ident_name = try astgen.identAsString(ident_token);
5061 try astgen.detectLocalShadowing(&then_scope.base, ident_name, ident_token);
5063 try astgen.detectLocalShadowing(&then_scope.base, ident_name, ident_token, ident_bytes);
50625064 payload_val_scope = .{
50635065 .parent = &then_scope.base,
50645066 .gen_zir = &then_scope,
......@@ -5100,7 +5102,7 @@ fn ifExpr(
51005102 const error_token_str = tree.tokenSlice(error_token);
51015103 if (mem.eql(u8, "_", error_token_str))
51025104 break :s &else_scope.base;
5103 try astgen.detectLocalShadowing(&else_scope.base, ident_name, error_token);
5105 try astgen.detectLocalShadowing(&else_scope.base, ident_name, error_token, error_token_str);
51045106 payload_val_scope = .{
51055107 .parent = &else_scope.base,
51065108 .gen_zir = &else_scope,
......@@ -5291,11 +5293,12 @@ fn whileExpr(
52915293 .err_union_payload_unsafe;
52925294 const payload_inst = try then_scope.addUnNode(tag, cond.inst, node);
52935295 const ident_token = if (payload_is_ref) payload_token + 1 else payload_token;
5294 if (mem.eql(u8, "_", tree.tokenSlice(ident_token)))
5296 const ident_bytes = tree.tokenSlice(ident_token);
5297 if (mem.eql(u8, "_", ident_bytes))
52955298 break :s &then_scope.base;
52965299 const payload_name_loc = payload_token + @boolToInt(payload_is_ref);
52975300 const ident_name = try astgen.identAsString(payload_name_loc);
5298 try astgen.detectLocalShadowing(&then_scope.base, ident_name, payload_name_loc);
5301 try astgen.detectLocalShadowing(&then_scope.base, ident_name, payload_name_loc, ident_bytes);
52995302 payload_val_scope = .{
53005303 .parent = &then_scope.base,
53015304 .gen_zir = &then_scope,
......@@ -5316,9 +5319,10 @@ fn whileExpr(
53165319 .optional_payload_unsafe;
53175320 const payload_inst = try then_scope.addUnNode(tag, cond.inst, node);
53185321 const ident_name = try astgen.identAsString(ident_token);
5319 if (mem.eql(u8, "_", tree.tokenSlice(ident_token)))
5322 const ident_bytes = tree.tokenSlice(ident_token);
5323 if (mem.eql(u8, "_", ident_bytes))
53205324 break :s &then_scope.base;
5321 try astgen.detectLocalShadowing(&then_scope.base, ident_name, ident_token);
5325 try astgen.detectLocalShadowing(&then_scope.base, ident_name, ident_token, ident_bytes);
53225326 payload_val_scope = .{
53235327 .parent = &then_scope.base,
53245328 .gen_zir = &then_scope,
......@@ -5374,9 +5378,10 @@ fn whileExpr(
53745378 .err_union_code;
53755379 const payload_inst = try else_scope.addUnNode(tag, cond.inst, node);
53765380 const ident_name = try astgen.identAsString(error_token);
5377 if (mem.eql(u8, tree.tokenSlice(error_token), "_"))
5381 const ident_bytes = tree.tokenSlice(error_token);
5382 if (mem.eql(u8, ident_bytes, "_"))
53785383 break :s &else_scope.base;
5379 try astgen.detectLocalShadowing(&else_scope.base, ident_name, error_token);
5384 try astgen.detectLocalShadowing(&else_scope.base, ident_name, error_token, ident_bytes);
53805385 payload_val_scope = .{
53815386 .parent = &else_scope.base,
53825387 .gen_zir = &else_scope,
......@@ -5523,7 +5528,7 @@ fn forExpr(
55235528 const name_str_index = try astgen.identAsString(ident);
55245529 const tag: Zir.Inst.Tag = if (is_ptr) .elem_ptr else .elem_val;
55255530 const payload_inst = try then_scope.addBin(tag, array_ptr, index);
5526 try astgen.detectLocalShadowing(&then_scope.base, name_str_index, ident);
5531 try astgen.detectLocalShadowing(&then_scope.base, name_str_index, ident, value_name);
55275532 payload_val_scope = .{
55285533 .parent = &then_scope.base,
55295534 .gen_zir = &then_scope,
......@@ -5543,11 +5548,12 @@ fn forExpr(
55435548 ident + 2
55445549 else
55455550 break :blk payload_sub_scope;
5546 if (mem.eql(u8, tree.tokenSlice(index_token), "_")) {
5551 const token_bytes = tree.tokenSlice(index_token);
5552 if (mem.eql(u8, token_bytes, "_")) {
55475553 return astgen.failTok(index_token, "discard of index capture; omit it instead", .{});
55485554 }
55495555 const index_name = try astgen.identAsString(index_token);
5550 try astgen.detectLocalShadowing(payload_sub_scope, index_name, index_token);
5556 try astgen.detectLocalShadowing(payload_sub_scope, index_name, index_token, token_bytes);
55515557 index_scope = .{
55525558 .parent = payload_sub_scope,
55535559 .gen_zir = &then_scope,
......@@ -10059,7 +10065,7 @@ fn declareNewName(
1005910065 const ns = scope.cast(Scope.Namespace).?;
1006010066 const gop = try ns.decls.getOrPut(gpa, name_index);
1006110067 if (gop.found_existing) {
10062 const name = try gpa.dupe(u8, mem.spanZ(astgen.nullTerminatedString(name_index)));
10068 const name = try gpa.dupe(u8, mem.span(astgen.nullTerminatedString(name_index)));
1006310069 defer gpa.free(name);
1006410070 return astgen.failNodeNotes(node, "redeclaration of '{s}'", .{
1006510071 name,
......@@ -10094,13 +10100,17 @@ fn detectLocalShadowing(
1009410100 scope: *Scope,
1009510101 ident_name: u32,
1009610102 name_token: ast.TokenIndex,
10103 token_bytes: []const u8,
1009710104) !void {
1009810105 const gpa = astgen.gpa;
10099 const name_slice = mem.spanZ(astgen.nullTerminatedString(ident_name));
10100 if (isPrimitive(name_slice)) {
10101 const name = try gpa.dupe(u8, name_slice);
10102 defer gpa.free(name);
10103 return astgen.failTok(name_token, "local shadows primitive '{s}'", .{name});
10106 if (token_bytes[0] != '@' and isPrimitive(token_bytes)) {
10107 return astgen.failTokNotes(name_token, "name shadows primitive '{s}'", .{
10108 token_bytes,
10109 }, &[_]u32{
10110 try astgen.errNoteTok(name_token, "consider using @\"{s}\" to disambiguate", .{
10111 token_bytes,
10112 }),
10113 });
1010410114 }
1010510115
1010610116 var s = scope;
......@@ -10108,6 +10118,7 @@ fn detectLocalShadowing(
1010810118 .local_val => {
1010910119 const local_val = s.cast(Scope.LocalVal).?;
1011010120 if (local_val.name == ident_name) {
10121 const name_slice = mem.span(astgen.nullTerminatedString(ident_name));
1011110122 const name = try gpa.dupe(u8, name_slice);
1011210123 defer gpa.free(name);
1011310124 return astgen.failTokNotes(name_token, "redeclaration of {s} '{s}'", .{
......@@ -10125,6 +10136,7 @@ fn detectLocalShadowing(
1012510136 .local_ptr => {
1012610137 const local_ptr = s.cast(Scope.LocalPtr).?;
1012710138 if (local_ptr.name == ident_name) {
10139 const name_slice = mem.span(astgen.nullTerminatedString(ident_name));
1012810140 const name = try gpa.dupe(u8, name_slice);
1012910141 defer gpa.free(name);
1013010142 return astgen.failTokNotes(name_token, "redeclaration of {s} '{s}'", .{
......@@ -10145,6 +10157,7 @@ fn detectLocalShadowing(
1014510157 s = ns.parent;
1014610158 continue;
1014710159 };
10160 const name_slice = mem.span(astgen.nullTerminatedString(ident_name));
1014810161 const name = try gpa.dupe(u8, name_slice);
1014910162 defer gpa.free(name);
1015010163 return astgen.failTokNotes(name_token, "local shadows declaration of '{s}'", .{
test/behavior/misc.zig+4
......@@ -533,4 +533,8 @@ test "use of declaration with same name as primitive" {
533533
534534 const b: S.alias = 300;
535535 try expect(b == 300);
536
537 const @"u8" = u16;
538 const c: @"u8" = 300;
539 try expect(c == 300);
536540}
test/compile_errors.zig+2-7
......@@ -7264,14 +7264,9 @@ pub fn addCases(ctx: *TestContext) !void {
72647264 \\ const a: u8 = 300;
72657265 \\ _ = a;
72667266 \\}
7267 \\export fn bar() void {
7268 \\ const @"u8" = u16;
7269 \\ const a: @"u8" = 300;
7270 \\ _ = a;
7271 \\}
72727267 , &[_][]const u8{
7273 "tmp.zig:2:11: error: local shadows primitive 'u8'",
7274 "tmp.zig:7:11: error: local shadows primitive 'u8'",
7268 "tmp.zig:2:11: error: name shadows primitive 'u8'",
7269 "tmp.zig:2:11: note: consider using @\"u8\" to disambiguate",
72757270 });
72767271
72777272 ctx.objErrStage1("primitives take precedence over declarations",