diff options
Diffstat (limited to 'src/parser.cpp')
| -rw-r--r-- | src/parser.cpp | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/src/parser.cpp b/src/parser.cpp index 6184a62ab..2c29f651a 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -337,6 +337,9 @@ Ast *clone_ast(Ast *node) { case Ast_PointerType: n->PointerType.type = clone_ast(n->PointerType.type); break; + case Ast_MultiPointerType: + n->MultiPointerType.type = clone_ast(n->MultiPointerType.type); + break; case Ast_ArrayType: n->ArrayType.count = clone_ast(n->ArrayType.count); n->ArrayType.elem = clone_ast(n->ArrayType.elem); @@ -985,7 +988,12 @@ Ast *ast_pointer_type(AstFile *f, Token token, Ast *type) { result->PointerType.type = type; return result; } - +Ast *ast_multi_pointer_type(AstFile *f, Token token, Ast *type) { + Ast *result = alloc_ast_node(f, Ast_MultiPointerType); + result->MultiPointerType.token = token; + result->MultiPointerType.type = type; + return result; +} Ast *ast_array_type(AstFile *f, Token token, Ast *count, Ast *elem) { Ast *result = alloc_ast_node(f, Ast_ArrayType); result->ArrayType.token = token; @@ -2317,7 +2325,11 @@ Ast *parse_operand(AstFile *f, bool lhs) { case Token_OpenBracket: { Token token = expect_token(f, Token_OpenBracket); Ast *count_expr = nullptr; - if (f->curr_token.kind == Token_Question) { + if (f->curr_token.kind == Token_Pointer) { + expect_token(f, Token_Pointer); + expect_token(f, Token_CloseBracket); + return ast_multi_pointer_type(f, token, parse_type(f)); + } else if (f->curr_token.kind == Token_Question) { count_expr = ast_unary_expr(f, expect_token(f, Token_Question), nullptr); } else if (allow_token(f, Token_dynamic)) { expect_token(f, Token_CloseBracket); @@ -4133,16 +4145,26 @@ Ast *parse_for_stmt(AstFile *f) { if (!is_range && parse_control_statement_semicolon_separator(f)) { init = cond; cond = nullptr; - if (f->curr_token.kind != Token_Semicolon) { - cond = parse_simple_stmt(f, StmtAllowFlag_None); - } - expect_semicolon(f, cond); - if (f->curr_token.kind != Token_OpenBrace && - f->curr_token.kind != Token_do) { - post = parse_simple_stmt(f, StmtAllowFlag_None); + + if (f->curr_token.kind == Token_OpenBrace || f->curr_token.kind == Token_do) { + syntax_error(f->curr_token, "Expected ';', followed by a condition expression and post statement, got %.*s", LIT(token_strings[f->curr_token.kind])); + } else { + if (f->curr_token.kind != Token_Semicolon) { + cond = parse_simple_stmt(f, StmtAllowFlag_None); + } + + if (f->curr_token.string != ";") { + syntax_error(f->curr_token, "Expected ';', got %.*s", LIT(token_to_string(f->curr_token))); + } else { + expect_semicolon(f, nullptr); + } + + if (f->curr_token.kind != Token_OpenBrace && + f->curr_token.kind != Token_do) { + post = parse_simple_stmt(f, StmtAllowFlag_None); + } } } - } |