From 52eb34718862928b5d83c58990d5d7a6b07e20e2 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 8 Jun 2019 01:16:19 -0400 Subject: hook up result locs for `try` --- src/parser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/parser.cpp') diff --git a/src/parser.cpp b/src/parser.cpp index 3d7bbf7801..43af347563 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -341,7 +341,7 @@ static AstNode *ast_parse_bin_op_expr( op->data.bin_op_expr.op1 = left; op->data.bin_op_expr.op2 = right; break; - case NodeTypeUnwrapErrorExpr: + case NodeTypeCatchExpr: op->data.unwrap_err_expr.op1 = left; op->data.unwrap_err_expr.op2 = right; break; @@ -2377,7 +2377,7 @@ static AstNode *ast_parse_bitwise_op(ParseContext *pc) { Token *catch_token = eat_token_if(pc, TokenIdKeywordCatch); if (catch_token != nullptr) { Token *payload = ast_parse_payload(pc); - AstNode *res = ast_create_node(pc, NodeTypeUnwrapErrorExpr, catch_token); + AstNode *res = ast_create_node(pc, NodeTypeCatchExpr, catch_token); if (payload != nullptr) res->data.unwrap_err_expr.symbol = token_symbol(pc, payload); @@ -2864,7 +2864,7 @@ void ast_visit_node_children(AstNode *node, void (*visit)(AstNode **, void *cont visit_field(&node->data.bin_op_expr.op1, visit, context); visit_field(&node->data.bin_op_expr.op2, visit, context); break; - case NodeTypeUnwrapErrorExpr: + case NodeTypeCatchExpr: visit_field(&node->data.unwrap_err_expr.op1, visit, context); visit_field(&node->data.unwrap_err_expr.symbol, visit, context); visit_field(&node->data.unwrap_err_expr.op2, visit, context); -- cgit v1.2.3 From cce11a724cfe8c266d961a422852a977a1601c6f Mon Sep 17 00:00:00 2001 From: hryx Date: Sat, 6 Jul 2019 15:57:32 -0700 Subject: Make anyerror not a keyword --- doc/langref.html.in | 4 +--- src/parser.cpp | 5 ----- src/tokenizer.cpp | 2 -- src/tokenizer.hpp | 1 - std/zig/parse.zig | 2 -- std/zig/tokenizer.zig | 2 -- 6 files changed, 1 insertion(+), 15 deletions(-) (limited to 'src/parser.cpp') diff --git a/doc/langref.html.in b/doc/langref.html.in index ae5744c52b..5437dcc801 100644 --- a/doc/langref.html.in +++ b/doc/langref.html.in @@ -9798,7 +9798,6 @@ PrimaryTypeExpr / IDENTIFIER / IfTypeExpr / INTEGER - / KEYWORD_anyerror / KEYWORD_comptime TypeExpr / KEYWORD_error DOT IDENTIFIER / KEYWORD_false @@ -10104,7 +10103,6 @@ end_of_word <- ![a-zA-Z0-9_] skip KEYWORD_align <- 'align' end_of_word KEYWORD_allowzero <- 'allowzero' end_of_word KEYWORD_and <- 'and' end_of_word -KEYWORD_anyerror <- 'anyerror' end_of_word KEYWORD_asm <- 'asm' end_of_word KEYWORD_async <- 'async' end_of_word KEYWORD_await <- 'await' end_of_word @@ -10153,7 +10151,7 @@ KEYWORD_var <- 'var' end_of_word KEYWORD_volatile <- 'volatile' end_of_word KEYWORD_while <- 'while' end_of_word -keyword <- KEYWORD_align / KEYWORD_and / KEYWORD_allowzero / KEYWORD_anyerror / KEYWORD_asm +keyword <- KEYWORD_align / KEYWORD_and / KEYWORD_allowzero / KEYWORD_asm / KEYWORD_async / KEYWORD_await / KEYWORD_break / KEYWORD_cancel / KEYWORD_catch / KEYWORD_comptime / KEYWORD_const / KEYWORD_continue / KEYWORD_defer / KEYWORD_else / KEYWORD_enum / KEYWORD_errdefer diff --git a/src/parser.cpp b/src/parser.cpp index f35e54f6de..25541d5351 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -1519,7 +1519,6 @@ static AstNode *ast_parse_suffix_expr(ParseContext *pc) { // / IDENTIFIER // / IfTypeExpr // / INTEGER -// / KEYWORD_anyerror // / KEYWORD_comptime TypeExpr // / KEYWORD_error DOT IDENTIFIER // / KEYWORD_false @@ -1614,10 +1613,6 @@ static AstNode *ast_parse_primary_type_expr(ParseContext *pc) { return res; } - Token *error_type = eat_token_if(pc, TokenIdKeywordAnyerror); - if (error_type != nullptr) - return ast_create_node(pc, NodeTypeErrorType, error_type); - Token *comptime = eat_token_if(pc, TokenIdKeywordCompTime); if (comptime != nullptr) { AstNode *expr = ast_expect(pc, ast_parse_type_expr); diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp index 4358146f24..783b6e0e20 100644 --- a/src/tokenizer.cpp +++ b/src/tokenizer.cpp @@ -109,7 +109,6 @@ static const struct ZigKeyword zig_keywords[] = { {"align", TokenIdKeywordAlign}, {"allowzero", TokenIdKeywordAllowZero}, {"and", TokenIdKeywordAnd}, - {"anyerror", TokenIdKeywordAnyerror}, {"asm", TokenIdKeywordAsm}, {"async", TokenIdKeywordAsync}, {"await", TokenIdKeywordAwait}, @@ -1528,7 +1527,6 @@ const char * token_name(TokenId id) { case TokenIdFloatLiteral: return "FloatLiteral"; case TokenIdIntLiteral: return "IntLiteral"; case TokenIdKeywordAsync: return "async"; - case TokenIdKeywordAnyerror: return "anyerror"; case TokenIdKeywordAllowZero: return "allowzero"; case TokenIdKeywordAwait: return "await"; case TokenIdKeywordResume: return "resume"; diff --git a/src/tokenizer.hpp b/src/tokenizer.hpp index d5174c24de..83dbe99471 100644 --- a/src/tokenizer.hpp +++ b/src/tokenizer.hpp @@ -53,7 +53,6 @@ enum TokenId { TokenIdKeywordAlign, TokenIdKeywordAllowZero, TokenIdKeywordAnd, - TokenIdKeywordAnyerror, TokenIdKeywordAsm, TokenIdKeywordAsync, TokenIdKeywordAwait, diff --git a/std/zig/parse.zig b/std/zig/parse.zig index da258c9237..4f3fb76b54 100644 --- a/std/zig/parse.zig +++ b/std/zig/parse.zig @@ -1197,7 +1197,6 @@ fn parseSuffixExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node { /// / IDENTIFIER /// / IfTypeExpr /// / INTEGER -/// / KEYWORD_anyerror /// / KEYWORD_comptime TypeExpr /// / KEYWORD_error DOT IDENTIFIER /// / KEYWORD_false @@ -1228,7 +1227,6 @@ fn parsePrimaryTypeExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*N if (try parseIdentifier(arena, it, tree)) |node| return node; if (try parseIfTypeExpr(arena, it, tree)) |node| return node; if (try parseIntegerLiteral(arena, it, tree)) |node| return node; - if (eatToken(it, .Keyword_anyerror)) |token| return createLiteral(arena, Node.ErrorType, token); if (eatToken(it, .Keyword_comptime)) |token| { const expr = (try parseTypeExpr(arena, it, tree)) orelse return null; const node = try arena.create(Node.Comptime); diff --git a/std/zig/tokenizer.zig b/std/zig/tokenizer.zig index 71765e2025..7bd5c537d3 100644 --- a/std/zig/tokenizer.zig +++ b/std/zig/tokenizer.zig @@ -15,7 +15,6 @@ pub const Token = struct { Keyword{ .bytes = "align", .id = Id.Keyword_align }, Keyword{ .bytes = "allowzero", .id = Id.Keyword_allowzero }, Keyword{ .bytes = "and", .id = Id.Keyword_and }, - Keyword{ .bytes = "anyerror", .id = Id.Keyword_anyerror }, Keyword{ .bytes = "asm", .id = Id.Keyword_asm }, Keyword{ .bytes = "async", .id = Id.Keyword_async }, Keyword{ .bytes = "await", .id = Id.Keyword_await }, @@ -147,7 +146,6 @@ pub const Token = struct { Keyword_align, Keyword_allowzero, Keyword_and, - Keyword_anyerror, Keyword_asm, Keyword_async, Keyword_await, -- cgit v1.2.3