mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-21 13:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #209 #assert bug

Browse Source
This commit is contained in:
gingerBill
2018-04-10 20:18:16 +01:00
parent 30f5a3bb93
commit b83c3f265b
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/check_expr.cpp
View File

@@ -1012,8 +1012,10 @@ Entity *check_ident(Checker *c, Operand *o, AstNode *n, Type *named_type, Type *
if (e->type == nullptr) {
if (e->state == EntityState_Unresolved) {
return nullptr;
}
compiler_error("How did this happen? type: %s; identifier: %.*s\n", type_to_string(e->type), LIT(name));
// return nullptr;
}
e->flags |= EntityFlag_Used;

15
src/parser.cpp
View File

@@ -3748,7 +3748,7 @@ AstNode *parse_stmt(AstFile *f) {
return s;
} else if (tag == "assert") {
AstNode *t = ast_basic_directive(f, hash_token, tag);
return parse_call_expr(f, t);
return ast_expr_stmt(f, parse_call_expr(f, t));
}
if (tag == "include") {
@@ -4077,11 +4077,14 @@ void parse_setup_file_decls(Parser *p, AstFile *f, String base_dir, Array<AstNod
node->kind != AstNode_WhenStmt) {
// NOTE(bill): Sanity check
if (node->kind == AstNode_CallExpr &&
node->CallExpr.proc->kind == AstNode_BasicDirective &&
node->CallExpr.proc->BasicDirective.name == "assert") {
// NOTE(bill): Okay!
continue;
if (node->kind == AstNode_ExprStmt) {
AstNode *expr = node->ExprStmt.expr;
if (expr->kind == AstNode_CallExpr &&
expr->CallExpr.proc->kind == AstNode_BasicDirective &&
expr->CallExpr.proc->BasicDirective.name == "assert") {
// NOTE(bill): Okay!
continue;
}
}
syntax_error(node, "Only declarations are allowed at file scope, got %.*s", LIT(ast_node_strings[node->kind]));