| author |  Andrew Kelley <andrew@ziglang.org> 2016-09-23 11:53:05-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2016-09-23 11:53:05-04:00 |
| log | 9ec6a78f121c8f61c10ea02f6949f27b0228ba16 |
| tree | e08bf750cfd8181fff72d52d20139e6cd6a805b7 |
| parent | 46eb77dbb200756b96bfae4c5166397fefba66d0 |
fix compiler crash for misspelled type with pointer only reference
closes #1962 files changed, 37 insertions(+), 0 deletions(-)
src
test
src/analyze.cpp+4
| ... | @@ -2468,6 +2468,10 @@ static TypeTableEntry *analyze_enum_value_expr(CodeGen *g, ImportTableEntry *imp | ... | @@ -2468,6 +2468,10 @@ static TypeTableEntry *analyze_enum_value_expr(CodeGen *g, ImportTableEntry *imp |
| 2468 | assert(field_access_node->type == NodeTypeFieldAccessExpr); | 2468 | assert(field_access_node->type == NodeTypeFieldAccessExpr); |
| 2469 | 2469 | ||
| 2470 | TypeEnumField *type_enum_field = get_enum_field(enum_type, field_name); | 2470 | TypeEnumField *type_enum_field = get_enum_field(enum_type, field_name); |
| 2471 | if (type_enum_field->type_entry->id == TypeTableEntryIdInvalid) { | ||
| 2472 | return g->builtin_types.entry_invalid; | ||
| 2473 | } | ||
| 2474 | |||
| 2471 | field_access_node->data.field_access_expr.type_enum_field = type_enum_field; | 2475 | field_access_node->data.field_access_expr.type_enum_field = type_enum_field; |
| 2472 | 2476 | ||
| 2473 | if (type_enum_field) { | 2477 | if (type_enum_field) { |
test/run_tests.cpp+33
| ... | @@ -1501,6 +1501,39 @@ fn foo(blah: []u8) { | ... | @@ -1501,6 +1501,39 @@ fn foo(blah: []u8) { |
| 1501 | for (blah) { } | 1501 | for (blah) { } |
| 1502 | } | 1502 | } |
| 1503 | )SOURCE", 1, ".tmp_source.zig:3:16: error: for loop expression missing element parameter"); | 1503 | )SOURCE", 1, ".tmp_source.zig:3:16: error: for loop expression missing element parameter"); |
| 1504 | |||
| 1505 | add_compile_fail_case("misspelled type with pointer only reference", R"SOURCE( | ||
| 1506 | const JasonHM = u8; | ||
| 1507 | const JasonList = &JsonNode; | ||
| 1508 | |||
| 1509 | enum JsonOA { | ||
| 1510 | JSONArray: JsonList, | ||
| 1511 | JSONObject: JasonHM, | ||
| 1512 | } | ||
| 1513 | |||
| 1514 | enum JsonType { | ||
| 1515 | JSONNull: void, | ||
| 1516 | JSONInteger: isize, | ||
| 1517 | JSONDouble: f64, | ||
| 1518 | JSONBool: bool, | ||
| 1519 | JSONString: []u8, | ||
| 1520 | JSONArray, | ||
| 1521 | JSONObject, | ||
| 1522 | } | ||
| 1523 | |||
| 1524 | pub struct JsonNode { | ||
| 1525 | kind: JsonType, | ||
| 1526 | jobject: ?JsonOA, | ||
| 1527 | } | ||
| 1528 | |||
| 1529 | fn foo() { | ||
| 1530 | var jll: JasonList = undefined; | ||
| 1531 | jll.init(&debug.global_allocator); | ||
| 1532 | var jd = JsonNode {.kind = JsonType.JSONArray , .jobject = JsonOA.JSONArray {jll} }; | ||
| 1533 | } | ||
| 1534 | )SOURCE", 2, | ||
| 1535 | ".tmp_source.zig:6:16: error: use of undeclared identifier 'JsonList'", | ||
| 1536 | ".tmp_source.zig:27:8: error: no function named 'init' in 'JsonNode'"); | ||
| 1504 | } | 1537 | } |
| 1505 | 1538 | ||
| 1506 | ////////////////////////////////////////////////////////////////////////////// | 1539 | ////////////////////////////////////////////////////////////////////////////// |