mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

AstGen: add error for redundant comptime var in comptime scope (#18242)

Browse Source
This commit is contained in:
Bogdan Romanyuk 2024-01-10 04:09:39 +03:00 committed by GitHub
parent 157cdaee0e
commit 4a1a5ee47b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/json/scanner_test.zig
View File

@ -200,7 +200,7 @@ const number_test_stems = .{
.{ "", "e0", "E0", "e+0", "e-0", "e9999999999999999999999999999" }, .{ "", "e0", "E0", "e+0", "e-0", "e9999999999999999999999999999" },
}; };
const number_test_items = blk: { const number_test_items = blk: {
comptime var ret: []const []const u8 = &[_][]const u8{}; var ret: []const []const u8 = &[_][]const u8{};
for (number_test_stems[0]) |s0| { for (number_test_stems[0]) |s0| {
for (number_test_stems[1]) |s1| { for (number_test_stems[1]) |s1| {
for (number_test_stems[2]) |s2| { for (number_test_stems[2]) |s2| {

2
lib/std/meta/trailer_flags.zig
View File

@ -20,7 +20,7 @@ pub fn TrailerFlags(comptime Fields: type) type {
pub const ActiveFields = std.enums.EnumFieldStruct(FieldEnum, bool, false); pub const ActiveFields = std.enums.EnumFieldStruct(FieldEnum, bool, false);
pub const FieldValues = blk: { pub const FieldValues = blk: {
comptime var fields: [bit_count]Type.StructField = undefined; var fields: [bit_count]Type.StructField = undefined;
for (@typeInfo(Fields).Struct.fields, 0..) |struct_field, i| { for (@typeInfo(Fields).Struct.fields, 0..) |struct_field, i| {
fields[i] = Type.StructField{ fields[i] = Type.StructField{
.name = struct_field.name, .name = struct_field.name,

2
src/AstGen.zig
View File

@ -3235,6 +3235,8 @@ fn varDecl(
return &sub_scope.base; return &sub_scope.base;
}, },
.keyword_var => { .keyword_var => {
if (var_decl.comptime_token != null and gz.is_comptime)
return astgen.failTok(var_decl.comptime_token.?, "'comptime var' is redundant in comptime scope", .{});
const is_comptime = var_decl.comptime_token != null or gz.is_comptime; const is_comptime = var_decl.comptime_token != null or gz.is_comptime;
var resolve_inferred_alloc: Zir.Inst.Ref = .none; var resolve_inferred_alloc: Zir.Inst.Ref = .none;
const alloc: Zir.Inst.Ref, const result_info: ResultInfo = if (var_decl.ast.type_node != 0) a: { const alloc: Zir.Inst.Ref, const result_info: ResultInfo = if (var_decl.ast.type_node != 0) a: {

7
test/cases/compile_errors/redundant_comptime_var.zig Normal file
View File

@ -0,0 +1,7 @@
comptime {
comptime var x = undefined;
}
// error
//
// :2:5: error: 'comptime var' is redundant in comptime scope