motiejus/zig
1
Fork 0
Code Releases Activity

AstGen: cleanups to pass more compile error test cases

Browse Source
This commit is contained in:
Andrew Kelley
2021-07-01 17:28:21 -07:00
parent 41336acb0b
commit 7a2e0d9810
9 changed files with 134 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/zig/ast.zig
View File

@@ -135,6 +135,8 @@ pub const Tree = struct {
const token_tags = tree.tokens.items(.tag);
switch (parse_error.tag) {
.asterisk_after_ptr_deref => {
// Note that the token will point at the `.*` but ideally the source
// location would point to the `*` after the `.*`.
return stream.writeAll("'.*' cannot be followed by '*'. Are you missing a space?");
},
.decl_between_fields => {

10
lib/std/zig/tokenizer.zig
View File

@@ -708,12 +708,18 @@ pub const Tokenizer = struct {
self.checkLiteralCharacter();
}
},
'\n', '\r' => break, // Look for this error later.
'\n' => {
result.tag = .invalid;
break;
},
else => self.checkLiteralCharacter(),
},
.string_literal_backslash => switch (c) {
'\n', '\r' => break, // Look for this error later.
'\n' => {
result.tag = .invalid;
break;
},
else => {
state = .string_literal;
},

33
src/AstGen.zig
View File

@@ -1704,7 +1704,7 @@ fn checkLabelRedefinition(astgen: *AstGen, parent_scope: *Scope, label: ast.Toke
}, &[_]u32{
try astgen.errNoteTok(
prev_label.token,
"previous definition is here",
"previous definition here",
.{},
),
});
@@ -4002,7 +4002,18 @@ fn containerDecl(
return astgen.failTok(comptime_token, "enum fields cannot be marked comptime", .{});
}
if (member.ast.type_expr != 0) {
return astgen.failNode(member.ast.type_expr, "enum fields do not have types", .{});
return astgen.failNodeNotes(
member.ast.type_expr,
"enum fields do not have types",
.{},
&[_]u32{
try astgen.errNoteNode(
node,
"consider 'union(enum)' here to make it a tagged union",
.{},
),
},
);
}
// Alignment expressions in enums are caught by the parser.
assert(member.ast.align_expr == 0);
@@ -4520,7 +4531,7 @@ fn tryExpr(
return astgen.failNode(node, "invalid 'try' outside function scope", .{});
};
if (parent_gz.in_defer) return astgen.failNode(node, "'try' is not allowed inside defer expression", .{});
if (parent_gz.in_defer) return astgen.failNode(node, "'try' not allowed inside defer expression", .{});
var block_scope = parent_gz.makeSubBlock(scope);
block_scope.setBreakResultLoc(rl);
@@ -5526,7 +5537,7 @@ fn switchExpr(
&[_]u32{
try astgen.errNoteTok(
src,
"previous else prong is here",
"previous else prong here",
.{},
),
},
@@ -5539,12 +5550,12 @@ fn switchExpr(
&[_]u32{
try astgen.errNoteTok(
case_src,
"else prong is here",
"else prong here",
.{},
),
try astgen.errNoteTok(
some_underscore,
"'_' prong is here",
"'_' prong here",
.{},
),
},
@@ -5567,7 +5578,7 @@ fn switchExpr(
&[_]u32{
try astgen.errNoteTok(
src,
"previous '_' prong is here",
"previous '_' prong here",
.{},
),
},
@@ -5580,12 +5591,12 @@ fn switchExpr(
&[_]u32{
try astgen.errNoteTok(
some_else,
"else prong is here",
"else prong here",
.{},
),
try astgen.errNoteTok(
case_src,
"'_' prong is here",
"'_' prong here",
.{},
),
},
@@ -9638,7 +9649,7 @@ fn detectLocalShadowing(
}, &[_]u32{
try astgen.errNoteTok(
local_val.token_src,
"previously declared here",
"previous declaration here",
.{},
),
});
@@ -9655,7 +9666,7 @@ fn detectLocalShadowing(
}, &[_]u32{
try astgen.errNoteTok(
local_ptr.token_src,
"previously declared here",
"previous declaration here",
.{},
),
});

14
src/stage1/astgen.cpp
View File

@@ -3169,7 +3169,7 @@ ZigVar *create_local_var(CodeGen *codegen, AstNode *node, Scope *parent_scope,
if (existing_var->var_type == nullptr || !type_is_invalid(existing_var->var_type)) {
ErrorMsg *msg = add_node_error(codegen, node,
buf_sprintf("redeclaration of variable '%s'", buf_ptr(name)));
add_error_note(codegen, msg, existing_var->decl_node, buf_sprintf("previous declaration is here"));
add_error_note(codegen, msg, existing_var->decl_node, buf_sprintf("previous declaration here"));
}
variable_entry->var_type = codegen->builtin_types.entry_invalid;
} else {
@@ -3191,7 +3191,7 @@ ZigVar *create_local_var(CodeGen *codegen, AstNode *node, Scope *parent_scope,
if (want_err_msg) {
ErrorMsg *msg = add_node_error(codegen, node,
buf_sprintf("redefinition of '%s'", buf_ptr(name)));
add_error_note(codegen, msg, tld->source_node, buf_sprintf("previous definition is here"));
add_error_note(codegen, msg, tld->source_node, buf_sprintf("previous definition here"));
}
variable_entry->var_type = codegen->builtin_types.entry_invalid;
}
@@ -3247,7 +3247,7 @@ static bool is_duplicate_label(CodeGen *g, Scope *scope, AstNode *node, Buf *nam
Buf *this_block_name = scope->id == ScopeIdBlock ? ((ScopeBlock *)scope)->name : ((ScopeLoop *)scope)->name;
if (this_block_name != nullptr && buf_eql_buf(name, this_block_name)) {
ErrorMsg *msg = add_node_error(g, node, buf_sprintf("redeclaration of label '%s'", buf_ptr(name)));
add_error_note(g, msg, scope->source_node, buf_sprintf("previous declaration is here"));
add_error_note(g, msg, scope->source_node, buf_sprintf("previous declaration here"));
return true;
}
}
@@ -7026,7 +7026,7 @@ static IrInstSrc *astgen_switch_expr(Stage1AstGen *ag, Scope *scope, AstNode *no
ErrorMsg *msg = add_node_error(ag->codegen, prong_node,
buf_sprintf("multiple else prongs in switch expression"));
add_error_note(ag->codegen, msg, else_prong,
buf_sprintf("previous else prong is here"));
buf_sprintf("previous else prong here"));
return ag->codegen->invalid_inst_src;
}
else_prong = prong_node;
@@ -7037,7 +7037,7 @@ static IrInstSrc *astgen_switch_expr(Stage1AstGen *ag, Scope *scope, AstNode *no
ErrorMsg *msg = add_node_error(ag->codegen, prong_node,
buf_sprintf("multiple '_' prongs in switch expression"));
add_error_note(ag->codegen, msg, underscore_prong,
buf_sprintf("previous '_' prong is here"));
buf_sprintf("previous '_' prong here"));
return ag->codegen->invalid_inst_src;
}
underscore_prong = prong_node;
@@ -7049,10 +7049,10 @@ static IrInstSrc *astgen_switch_expr(Stage1AstGen *ag, Scope *scope, AstNode *no
buf_sprintf("else and '_' prong in switch expression"));
if (underscore_prong == prong_node)
add_error_note(ag->codegen, msg, else_prong,
buf_sprintf("else prong is here"));
buf_sprintf("else prong here"));
else
add_error_note(ag->codegen, msg, underscore_prong,
buf_sprintf("'_' prong is here"));
buf_sprintf("'_' prong here"));
return ag->codegen->invalid_inst_src;
}
ResultLocPeer *this_peer_result_loc = create_peer_result(peer_parent);

12
src/stage1/ir.cpp
View File

@@ -11097,7 +11097,7 @@ static IrInstGen *ir_analyze_instruction_export(IrAnalyze *ira, IrInstSrcExport
AstNode *other_export_node = entry->value->source_node;
ErrorMsg *msg = ir_add_error(ira, &instruction->base.base,
buf_sprintf("exported symbol collision: '%s'", buf_ptr(symbol_name)));
add_error_note(ira->codegen, msg, other_export_node, buf_sprintf("other symbol is here"));
add_error_note(ira->codegen, msg, other_export_node, buf_sprintf("other symbol here"));
return ira->codegen->invalid_inst_gen;
}
@@ -11403,7 +11403,7 @@ static IrInstGen *ir_analyze_instruction_extern(IrAnalyze *ira, IrInstSrcExtern
AstNode *other_extern_node = entry->value->source_node;
ErrorMsg *msg = ir_add_error(ira, &instruction->base.base,
buf_sprintf("extern symbol collision: '%s'", buf_ptr(symbol_name)));
add_error_note(ira->codegen, msg, other_extern_node, buf_sprintf("other symbol is here"));
add_error_note(ira->codegen, msg, other_extern_node, buf_sprintf("other symbol here"));
return ira->codegen->invalid_inst_gen;
}
@@ -21732,7 +21732,7 @@ static IrInstGen *ir_analyze_instruction_check_switch_prongs(IrAnalyze *ira,
ErrorMsg *msg = ir_add_error(ira, &start_value->base,
buf_sprintf("duplicate switch value: '%s.%s'", buf_ptr(&switch_type->name),
buf_ptr(enum_field->name)));
add_error_note(ira->codegen, msg, prev_node, buf_sprintf("other value is here"));
add_error_note(ira->codegen, msg, prev_node, buf_sprintf("other value here"));
}
bigint_incr(&field_index);
}
@@ -21818,7 +21818,7 @@ static IrInstGen *ir_analyze_instruction_check_switch_prongs(IrAnalyze *ira,
Buf *err_name = &ira->codegen->errors_by_index.at(start_index)->name;
ErrorMsg *msg = ir_add_error(ira, &start_value->base,
buf_sprintf("duplicate switch value: '%s.%s'", buf_ptr(&switch_type->name), buf_ptr(err_name)));
add_error_note(ira->codegen, msg, prev_node, buf_sprintf("other value is here"));
add_error_note(ira->codegen, msg, prev_node, buf_sprintf("other value here"));
}
field_prev_uses[start_index] = start_value->base.source_node;
}
@@ -21880,7 +21880,7 @@ static IrInstGen *ir_analyze_instruction_check_switch_prongs(IrAnalyze *ira,
start_value->base.source_node);
if (prev_node != nullptr) {
ErrorMsg *msg = ir_add_error(ira, &start_value->base, buf_sprintf("duplicate switch value"));
add_error_note(ira->codegen, msg, prev_node, buf_sprintf("previous value is here"));
add_error_note(ira->codegen, msg, prev_node, buf_sprintf("previous value here"));
return ira->codegen->invalid_inst_gen;
}
}
@@ -21965,7 +21965,7 @@ static IrInstGen *ir_analyze_instruction_check_switch_prongs(IrAnalyze *ira,
auto entry = prevs.put_unique(const_expr_val->data.x_type, value);
if(entry != nullptr) {
ErrorMsg *msg = ir_add_error(ira, &value->base, buf_sprintf("duplicate switch value"));
add_error_note(ira->codegen, msg, entry->value->base.source_node, buf_sprintf("previous value is here"));
add_error_note(ira->codegen, msg, entry->value->base.source_node, buf_sprintf("previous value here"));
prevs.deinit();
return ira->codegen->invalid_inst_gen;
}

4
test/cases.zig
View File

@@ -25,7 +25,7 @@ pub fn addCases(ctx: *TestContext) !void {
var case = ctx.exe("hello world with updates", linux_x64);
case.addError("", &[_][]const u8{
":93:9: error: struct 'test_case.test_case' has no member named 'main'",
":93:9: error: struct 'tmp.tmp' has no member named 'main'",
});
// Incorrect return type
@@ -965,7 +965,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\ defer return a();
\\}
, &[_][]const u8{
":7:8: error: try is not allowed inside defer expression",
":7:8: error: 'try' not allowed inside defer expression",
":10:8: error: cannot return from defer expression",
});

165
test/compile_errors.zig
View File

@@ -614,11 +614,11 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &[_][]const u8{
"tmp.zig:2:12: error: redefinition of label 'blk'",
"tmp.zig:2:5: note: previous definition is here",
"tmp.zig:2:5: note: previous definition here",
"tmp.zig:5:26: error: redefinition of label 'blk'",
"tmp.zig:5:5: note: previous definition is here",
"tmp.zig:5:5: note: previous definition here",
"tmp.zig:8:46: error: redefinition of label 'blk'",
"tmp.zig:8:5: note: previous definition is here",
"tmp.zig:8:5: note: previous definition here",
"tmp.zig:11:5: error: unused block label",
"tmp.zig:14:5: error: unused while loop label",
"tmp.zig:17:5: error: unused for loop label",
@@ -4261,7 +4261,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &[_][]const u8{
"tmp.zig:5:14: error: duplicate switch value: '@typeInfo(@typeInfo(@TypeOf(foo)).Fn.return_type.?).ErrorUnion.error_set.Foo'",
"tmp.zig:3:14: note: other value is here",
"tmp.zig:3:14: note: other value here",
});
ctx.objErrStage1("invalid cast from integral type to enum",
@@ -4932,8 +4932,8 @@ pub fn addCases(ctx: *TestContext) !void {
});
ctx.objErrStage1("wrong number of arguments",
\\export fn a() void {
\\ b(1);
\\export fn d() void {
\\ e(1);
\\}
\\fn b(a: i32, b: i32, c: i32) void { _ = a; _ = b; _ = c; }
, &[_][]const u8{
@@ -4988,7 +4988,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
\\export fn entry() void { f(1, 2); }
, &[_][]const u8{
"tmp.zig:1:15: error: redeclaration of parameter 'a'",
"tmp.zig:1:15: error: redeclaration of function parameter 'a'",
"tmp.zig:1:6: note: previous declaration here",
});
@@ -4998,7 +4998,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\ var a = 0;
\\}
, &[_][]const u8{
"tmp.zig:3:9: error: redeclaration of local const 'a'",
"tmp.zig:3:9: error: redeclaration of local constant 'a'",
"tmp.zig:2:11: note: previous declaration here",
});
@@ -5008,7 +5008,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
\\export fn entry() void { f(1); }
, &[_][]const u8{
"tmp.zig:2:11: error: redeclaration of parameter 'a'",
"tmp.zig:2:11: error: redeclaration of function parameter 'a'",
"tmp.zig:1:6: note: previous declaration here",
});
@@ -5295,7 +5295,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\ _ = foo;
\\}
, &[_][]const u8{
"tmp.zig:1:21: error: type '[3]u16' does not support struct initialization syntax",
"tmp.zig:1:13: error: initializing array with struct syntax",
});
ctx.objErrStage1("type variables must be constant",
@@ -5307,23 +5307,28 @@ pub fn addCases(ctx: *TestContext) !void {
"tmp.zig:1:1: error: variable of type 'type' must be constant",
});
ctx.objErrStage1("variables shadowing types",
ctx.objErrStage1("parameter shadowing global",
\\const Foo = struct {};
\\const Bar = struct {};
\\
\\fn f(Foo: i32) void {
\\ var Bar : i32 = undefined;
\\ _ = Bar;
\\}
\\
\\fn f(Foo: i32) void {}
\\export fn entry() void {
\\ f(1234);
\\}
, &[_][]const u8{
"tmp.zig:4:6: error: redefinition of 'Foo'",
"tmp.zig:1:1: note: previous definition is here",
"tmp.zig:5:5: error: redefinition of 'Bar'",
"tmp.zig:2:1: note: previous definition is here",
"tmp.zig:2:6: error: local shadows declaration of 'Foo'",
"tmp.zig:1:1: note: declared here",
});
ctx.objErrStage1("local variable shadowing global",
\\const Foo = struct {};
\\const Bar = struct {};
\\
\\export fn entry() void {
\\ var Bar : i32 = undefined;
\\ _ = Bar;
\\}
, &[_][]const u8{
"tmp.zig:5:9: error: local shadows declaration of 'Bar'",
"tmp.zig:2:1: note: declared here",
});
ctx.objErrStage1("switch expression - missing enumeration prong",
@@ -5366,7 +5371,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\export fn entry() usize { return @sizeOf(@TypeOf(f)); }
, &[_][]const u8{
"tmp.zig:13:15: error: duplicate switch value",
"tmp.zig:10:15: note: other value is here",
"tmp.zig:10:15: note: other value here",
});
ctx.objErrStage1("switch expression - duplicate enumeration prong when else present",
@@ -5390,7 +5395,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\export fn entry() usize { return @sizeOf(@TypeOf(f)); }
, &[_][]const u8{
"tmp.zig:13:15: error: duplicate switch value",
"tmp.zig:10:15: note: other value is here",
"tmp.zig:10:15: note: other value here",
});
ctx.objErrStage1("switch expression - multiple else prongs",
@@ -5431,7 +5436,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\export fn entry() usize { return @sizeOf(@TypeOf(foo)); }
, &[_][]const u8{
"tmp.zig:6:9: error: duplicate switch value",
"tmp.zig:5:14: note: previous value is here",
"tmp.zig:5:14: note: previous value here",
});
ctx.objErrStage1("switch expression - duplicate type",
@@ -5447,7 +5452,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\export fn entry() usize { return @sizeOf(@TypeOf(foo(u32, 0))); }
, &[_][]const u8{
"tmp.zig:6:9: error: duplicate switch value",
"tmp.zig:4:9: note: previous value is here",
"tmp.zig:4:9: note: previous value here",
});
ctx.objErrStage1("switch expression - duplicate type (struct alias)",
@@ -5467,7 +5472,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\export fn entry() usize { return @sizeOf(@TypeOf(foo(u32, 0))); }
, &[_][]const u8{
"tmp.zig:10:9: error: duplicate switch value",
"tmp.zig:8:9: note: previous value is here",
"tmp.zig:8:9: note: previous value here",
});
ctx.objErrStage1("switch expression - switch on pointer type with no else",
@@ -5662,10 +5667,9 @@ pub fn addCases(ctx: *TestContext) !void {
ctx.objErrStage1("normal string with newline",
\\const foo = "a
\\b";
\\
\\export fn entry() usize { return @sizeOf(@TypeOf(foo)); }
, &[_][]const u8{
"tmp.zig:1:15: error: newline not allowed in string literal",
"tmp.zig:1:13: error: expected expression, found 'invalid'",
"tmp.zig:1:15: note: invalid byte here",
});
ctx.objErrStage1("invalid comparison for function pointers",
@@ -6595,7 +6599,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\
\\export fn entry() usize { return @sizeOf(@TypeOf(testTrickyDefer)); }
, &[_][]const u8{
"tmp.zig:4:11: error: 'try' is not allowed inside defer expression",
"tmp.zig:4:11: error: 'try' not allowed inside defer expression",
});
ctx.objErrStage1("assign too big number to u16",
@@ -6976,7 +6980,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &[_][]const u8{
"tmp.zig:9:17: error: redefinition of 'Self'",
"tmp.zig:5:9: note: previous definition is here",
"tmp.zig:5:9: note: previous definition here",
});
ctx.objErrStage1("while expected bool, got optional",
@@ -7692,24 +7696,18 @@ pub fn addCases(ctx: *TestContext) !void {
\\ _ = x;
\\}
, &[_][]const u8{
"tmp.zig:2:14: error: untagged union field assignment",
"tmp.zig:1:24: note: consider 'union(enum)' here",
"tmp.zig:1:24: error: explicitly valued tagged union missing integer tag type",
"tmp.zig:2:14: note: tag value specified here",
});
ctx.objErrStage1("enum with 0 fields",
\\const Foo = enum {};
\\export fn entry() usize {
\\ return @sizeOf(Foo);
\\}
, &[_][]const u8{
"tmp.zig:1:13: error: enums must have 1 or more fields",
"tmp.zig:1:13: error: enum declarations must have at least one tag",
});
ctx.objErrStage1("union with 0 fields",
\\const Foo = union {};
\\export fn entry() usize {
\\ return @sizeOf(Foo);
\\}
, &[_][]const u8{
"tmp.zig:1:13: error: union declarations must have at least one tag",
});
@@ -7817,13 +7815,9 @@ pub fn addCases(ctx: *TestContext) !void {
\\ B,
\\ C,
\\};
\\export fn entry() void {
\\ var b = Letter.B;
\\ _ = b;
\\}
, &[_][]const u8{
"tmp.zig:2:8: error: structs and unions, not enums, support field types",
"tmp.zig:1:16: note: consider 'union(enum)' here",
"tmp.zig:2:8: error: enum fields do not have types",
"tmp.zig:1:16: note: consider 'union(enum)' here to make it a tagged union",
});
ctx.objErrStage1("struct field missing type",
@@ -8231,9 +8225,9 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &[_][]const u8{
"tmp.zig:3:28: error: parameter of opaque type 'FooType' not allowed",
"tmp.zig:7:28: error: parameter of type '(null)' not allowed",
"tmp.zig:10:11: error: parameter of opaque type 'FooType' not allowed",
"tmp.zig:15:11: error: parameter of type '(null)' not allowed",
"tmp.zig:8:28: error: parameter of type '(null)' not allowed",
"tmp.zig:12:11: error: parameter of opaque type 'FooType' not allowed",
"tmp.zig:17:11: error: parameter of type '(null)' not allowed",
});
ctx.objErrStage1( // fixed bug #2032
@@ -8268,8 +8262,8 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &[_][]const u8{
"tmp.zig:3:19: error: use of undefined value here causes undefined behavior",
"tmp.zig:8:23: error: use of undefined value here causes undefined behavior",
"tmp.zig:14:23: error: use of undefined value here causes undefined behavior",
"tmp.zig:9:23: error: use of undefined value here causes undefined behavior",
"tmp.zig:16:23: error: use of undefined value here causes undefined behavior",
});
ctx.objErrStage1("issue #3818: bitcast from parray/slice to u16",
@@ -8285,8 +8279,8 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &[_][]const u8{
"tmp.zig:3:42: error: unable to @bitCast from pointer type '*[2]u8'",
"tmp.zig:7:32: error: destination type 'u16' has size 2 but source type '[]const u8' has size 16",
"tmp.zig:7:37: note: referenced here",
"tmp.zig:8:32: error: destination type 'u16' has size 2 but source type '[]const u8' has size 16",
"tmp.zig:8:37: note: referenced here",
});
// issue #7810
@@ -8361,12 +8355,12 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &[_][]const u8{
":4:29: error: slice-sentinel is out of bounds",
":11:29: error: slice-sentinel is out of bounds",
":18:29: error: slice-sentinel is out of bounds",
":25:29: error: slice-sentinel is out of bounds",
":32:29: error: slice-sentinel is out of bounds",
":39:29: error: slice-sentinel is out of bounds",
":46:29: error: slice-sentinel is out of bounds",
":12:29: error: slice-sentinel is out of bounds",
":20:29: error: slice-sentinel is out of bounds",
":28:29: error: slice-sentinel is out of bounds",
":36:29: error: slice-sentinel is out of bounds",
":44:29: error: slice-sentinel is out of bounds",
":52:29: error: slice-sentinel is out of bounds",
});
ctx.objErrStage1("comptime slice-sentinel is out of bounds (terminated)",
@@ -8427,12 +8421,12 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &[_][]const u8{
":4:29: error: out of bounds slice",
":11:29: error: out of bounds slice",
":18:29: error: out of bounds slice",
":25:29: error: out of bounds slice",
":32:29: error: out of bounds slice",
":39:29: error: out of bounds slice",
":46:29: error: out of bounds slice",
":12:29: error: out of bounds slice",
":20:29: error: out of bounds slice",
":28:29: error: out of bounds slice",
":36:29: error: out of bounds slice",
":44:29: error: out of bounds slice",
":52:29: error: out of bounds slice",
});
ctx.objErrStage1("comptime slice-sentinel does not match memory at target index (unterminated)",
@@ -8493,12 +8487,12 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &[_][]const u8{
":4:29: error: slice-sentinel does not match memory at target index",
":11:29: error: slice-sentinel does not match memory at target index",
":18:29: error: slice-sentinel does not match memory at target index",
":25:29: error: slice-sentinel does not match memory at target index",
":32:29: error: slice-sentinel does not match memory at target index",
":39:29: error: slice-sentinel does not match memory at target index",
":46:29: error: slice-sentinel does not match memory at target index",
":12:29: error: slice-sentinel does not match memory at target index",
":20:29: error: slice-sentinel does not match memory at target index",
":28:29: error: slice-sentinel does not match memory at target index",
":36:29: error: slice-sentinel does not match memory at target index",
":44:29: error: slice-sentinel does not match memory at target index",
":52:29: error: slice-sentinel does not match memory at target index",
});
ctx.objErrStage1("comptime slice-sentinel does not match memory at target index (terminated)",
@@ -8559,12 +8553,12 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &[_][]const u8{
":4:29: error: slice-sentinel does not match memory at target index",
":11:29: error: slice-sentinel does not match memory at target index",
":18:29: error: slice-sentinel does not match memory at target index",
":25:29: error: slice-sentinel does not match memory at target index",
":32:29: error: slice-sentinel does not match memory at target index",
":39:29: error: slice-sentinel does not match memory at target index",
":46:29: error: slice-sentinel does not match memory at target index",
":12:29: error: slice-sentinel does not match memory at target index",
":20:29: error: slice-sentinel does not match memory at target index",
":28:29: error: slice-sentinel does not match memory at target index",
":36:29: error: slice-sentinel does not match memory at target index",
":44:29: error: slice-sentinel does not match memory at target index",
":52:29: error: slice-sentinel does not match memory at target index",
});
ctx.objErrStage1("comptime slice-sentinel does not match target-sentinel",
@@ -8625,12 +8619,12 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &[_][]const u8{
":4:29: error: slice-sentinel does not match target-sentinel",
":11:29: error: slice-sentinel does not match target-sentinel",
":18:29: error: slice-sentinel does not match target-sentinel",
":25:29: error: slice-sentinel does not match target-sentinel",
":32:29: error: slice-sentinel does not match target-sentinel",
":39:29: error: slice-sentinel does not match target-sentinel",
":46:29: error: slice-sentinel does not match target-sentinel",
":12:29: error: slice-sentinel does not match target-sentinel",
":20:29: error: slice-sentinel does not match target-sentinel",
":28:29: error: slice-sentinel does not match target-sentinel",
":36:29: error: slice-sentinel does not match target-sentinel",
":44:29: error: slice-sentinel does not match target-sentinel",
":52:29: error: slice-sentinel does not match target-sentinel",
});
ctx.objErrStage1("issue #4207: coerce from non-terminated-slice to terminated-pointer",
@@ -8774,7 +8768,8 @@ pub fn addCases(ctx: *TestContext) !void {
\\ _ = sequence;
\\}
, &[_][]const u8{
"tmp.zig:2:30: error: `.*` cannot be followed by `*`. Are you missing a space?",
// Ideally this would be column 30 but it's not very important.
"tmp.zig:2:28: error: `.*` cannot be followed by `*`. Are you missing a space?",
});
ctx.objErrStage1("Issue #9165: windows tcp server compilation error",

12
test/stage2/cbe.zig
View File

@@ -525,7 +525,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\}
, &.{
":3:21: error: missing struct field: x",
":1:15: note: struct 'test_case.Point' declared here",
":1:15: note: struct 'tmp.Point' declared here",
});
case.addError(
\\const Point = struct { x: i32, y: i32 };
@@ -538,7 +538,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\ return p.y - p.x - p.x;
\\}
, &.{
":6:10: error: no field named 'z' in struct 'test_case.Point'",
":6:10: error: no field named 'z' in struct 'tmp.Point'",
":1:15: note: struct declared here",
});
case.addCompareOutput(
@@ -716,7 +716,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\ _ = @intToEnum(E, 3);
\\}
, &.{
":3:9: error: enum 'test_case.E' has no tag with value 3",
":3:9: error: enum 'tmp.E' has no tag with value 3",
":1:11: note: enum declared here",
});
@@ -732,7 +732,7 @@ pub fn addCases(ctx: *TestContext) !void {
, &.{
":4:5: error: switch must handle all possibilities",
":4:5: note: unhandled enumeration value: 'b'",
":1:11: note: enum 'test_case.E' declared here",
":1:11: note: enum 'tmp.E' declared here",
});
case.addError(
@@ -787,7 +787,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\ _ = E.d;
\\}
, &.{
":3:10: error: enum 'test_case.E' has no member named 'd'",
":3:10: error: enum 'tmp.E' has no member named 'd'",
":1:11: note: enum declared here",
});
@@ -798,7 +798,7 @@ pub fn addCases(ctx: *TestContext) !void {
\\ _ = x;
\\}
, &.{
":3:17: error: enum 'test_case.E' has no field named 'd'",
":3:17: error: enum 'tmp.E' has no field named 'd'",
":1:11: note: enum declared here",
});
}

2
test/stage2/darwin.zig
View File

@@ -14,7 +14,7 @@ pub fn addCases(ctx: *TestContext) !void {
{
var case = ctx.exe("hello world with updates", target);
case.addError("", &[_][]const u8{
":93:9: error: struct 'test_case.test_case' has no member named 'main'",
":93:9: error: struct 'tmp.tmp' has no member named 'main'",
});
// Incorrect return type