jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-12-03 10:28:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

pass more tests by updating expected error messages

Browse Source
This commit is contained in:
Andrew Kelley 2017-01-05 19:20:31 -05:00
parent 837cc467f7
commit 28403eaad0
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/analyze.cpp
View File

@ -1108,7 +1108,7 @@ static void resolve_enum_type(CodeGen *g, TypeTableEntry *enum_type) {
if (enum_type->data.enumeration.embedded_in_current) { if (enum_type->data.enumeration.embedded_in_current) {
if (!enum_type->data.enumeration.reported_infinite_err) { if (!enum_type->data.enumeration.reported_infinite_err) {
enum_type->data.enumeration.reported_infinite_err = true; enum_type->data.enumeration.reported_infinite_err = true;
add_node_error(g, decl_node, buf_sprintf("enum contains itself")); add_node_error(g, decl_node, buf_sprintf("enum '%s' contains itself", buf_ptr(&enum_type->name)));
} }
return; return;
} }
@ -1286,7 +1286,8 @@ static void resolve_struct_type(CodeGen *g, TypeTableEntry *struct_type) {
struct_type->data.structure.is_invalid = true; struct_type->data.structure.is_invalid = true;
if (!struct_type->data.structure.reported_infinite_err) { if (!struct_type->data.structure.reported_infinite_err) {
struct_type->data.structure.reported_infinite_err = true; struct_type->data.structure.reported_infinite_err = true;
add_node_error(g, decl_node, buf_sprintf("struct contains itself")); add_node_error(g, decl_node,
buf_sprintf("struct '%s' contains itself", buf_ptr(&struct_type->name)));
} }
return; return;
} }

8
test/run_tests.cpp
View File

@ -841,7 +841,7 @@ const x : i32 = 99;
fn f() { fn f() {
x = 1; x = 1;
} }
)SOURCE", 1, ".tmp_source.zig:4:5: error: cannot assign to constant"); )SOURCE", 1, ".tmp_source.zig:4:7: error: cannot assign to constant");
add_compile_fail_case("missing else clause", R"SOURCE( add_compile_fail_case("missing else clause", R"SOURCE(
@ -849,18 +849,18 @@ fn f(b: bool) {
const x : i32 = if (b) { 1 }; const x : i32 = if (b) { 1 };
const y = if (b) { i32(1) }; const y = if (b) { i32(1) };
} }
)SOURCE", 2, ".tmp_source.zig:3:21: error: expected type 'i32', found 'void'", )SOURCE", 2, ".tmp_source.zig:3:30: error: integer value 1 cannot be implicitly casted to type 'void'",
".tmp_source.zig:4:15: error: incompatible types: 'i32' and 'void'"); ".tmp_source.zig:4:15: error: incompatible types: 'i32' and 'void'");
add_compile_fail_case("direct struct loop", R"SOURCE( add_compile_fail_case("direct struct loop", R"SOURCE(
const A = struct { a : A, }; const A = struct { a : A, };
)SOURCE", 1, ".tmp_source.zig:2:1: error: 'A' depends on itself"); )SOURCE", 1, ".tmp_source.zig:2:11: error: struct 'A' contains itself");
add_compile_fail_case("indirect struct loop", R"SOURCE( add_compile_fail_case("indirect struct loop", R"SOURCE(
const A = struct { b : B, }; const A = struct { b : B, };
const B = struct { c : C, }; const B = struct { c : C, };
const C = struct { a : A, }; const C = struct { a : A, };
)SOURCE", 1, ".tmp_source.zig:2:1: error: 'A' depends on itself"); )SOURCE", 1, ".tmp_source.zig:2:11: error: struct 'A' contains itself");
add_compile_fail_case("invalid struct field", R"SOURCE( add_compile_fail_case("invalid struct field", R"SOURCE(
const A = struct { x : i32, }; const A = struct { x : i32, };