| author |  Andrew Kelley <andrew@ziglang.org> 2019-07-07 09:44:48-04:00 |
| committer |  GitHub <noreply@github.com> 2019-07-07 09:44:48-04:00 |
| log | e12eb5e7f6d257323adf949c9c850323b9d4ebba |
| tree | bc1d6ce1d379d64243b1ba4129a73e9544f1c91d |
| parent | b118806c69e44029a7af9c9b8bdfa9cdcd280260 |
| parent | 28b59a0be716a2d9ef0fc365ee51b834199503e1 |
| signature |  Signed by PGP key 4AEE18F83AFDEB23 |
Merge pull request #2835 from hryx/de-keyword-anyerror
Make anyerror not a keyword7 files changed, 1 insertions(+), 16 deletions(-)
doc/docgen.zig-1
| ... | @@ -746,7 +746,6 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok | ... | @@ -746,7 +746,6 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok |
| 746 | 746 | ||
| 747 | std.zig.Token.Id.Keyword_align, | 747 | std.zig.Token.Id.Keyword_align, |
| 748 | std.zig.Token.Id.Keyword_and, | 748 | std.zig.Token.Id.Keyword_and, |
| 749 | std.zig.Token.Id.Keyword_anyerror, | ||
| 750 | std.zig.Token.Id.Keyword_asm, | 749 | std.zig.Token.Id.Keyword_asm, |
| 751 | std.zig.Token.Id.Keyword_async, | 750 | std.zig.Token.Id.Keyword_async, |
| 752 | std.zig.Token.Id.Keyword_await, | 751 | std.zig.Token.Id.Keyword_await, |
doc/langref.html.in+1-3
| ... | @@ -9798,7 +9798,6 @@ PrimaryTypeExpr | ... | @@ -9798,7 +9798,6 @@ PrimaryTypeExpr |
| 9798 | / IDENTIFIER | 9798 | / IDENTIFIER |
| 9799 | / IfTypeExpr | 9799 | / IfTypeExpr |
| 9800 | / INTEGER | 9800 | / INTEGER |
| 9801 | / KEYWORD_anyerror | ||
| 9802 | / KEYWORD_comptime TypeExpr | 9801 | / KEYWORD_comptime TypeExpr |
| 9803 | / KEYWORD_error DOT IDENTIFIER | 9802 | / KEYWORD_error DOT IDENTIFIER |
| 9804 | / KEYWORD_false | 9803 | / KEYWORD_false |
| ... | @@ -10104,7 +10103,6 @@ end_of_word <- ![a-zA-Z0-9_] skip | ... | @@ -10104,7 +10103,6 @@ end_of_word <- ![a-zA-Z0-9_] skip |
| 10104 | KEYWORD_align <- 'align' end_of_word | 10103 | KEYWORD_align <- 'align' end_of_word |
| 10105 | KEYWORD_allowzero <- 'allowzero' end_of_word | 10104 | KEYWORD_allowzero <- 'allowzero' end_of_word |
| 10106 | KEYWORD_and <- 'and' end_of_word | 10105 | KEYWORD_and <- 'and' end_of_word |
| 10107 | KEYWORD_anyerror <- 'anyerror' end_of_word | ||
| 10108 | KEYWORD_asm <- 'asm' end_of_word | 10106 | KEYWORD_asm <- 'asm' end_of_word |
| 10109 | KEYWORD_async <- 'async' end_of_word | 10107 | KEYWORD_async <- 'async' end_of_word |
| 10110 | KEYWORD_await <- 'await' end_of_word | 10108 | KEYWORD_await <- 'await' end_of_word |
| ... | @@ -10153,7 +10151,7 @@ KEYWORD_var <- 'var' end_of_word | ... | @@ -10153,7 +10151,7 @@ KEYWORD_var <- 'var' end_of_word |
| 10153 | KEYWORD_volatile <- 'volatile' end_of_word | 10151 | KEYWORD_volatile <- 'volatile' end_of_word |
| 10154 | KEYWORD_while <- 'while' end_of_word | 10152 | KEYWORD_while <- 'while' end_of_word |
| 10155 | 10153 | ||
| 10156 | keyword <- KEYWORD_align / KEYWORD_and / KEYWORD_allowzero / KEYWORD_anyerror / KEYWORD_asm | 10154 | keyword <- KEYWORD_align / KEYWORD_and / KEYWORD_allowzero / KEYWORD_asm |
| 10157 | / KEYWORD_async / KEYWORD_await / KEYWORD_break / KEYWORD_cancel | 10155 | / KEYWORD_async / KEYWORD_await / KEYWORD_break / KEYWORD_cancel |
| 10158 | / KEYWORD_catch / KEYWORD_comptime / KEYWORD_const / KEYWORD_continue | 10156 | / KEYWORD_catch / KEYWORD_comptime / KEYWORD_const / KEYWORD_continue |
| 10159 | / KEYWORD_defer / KEYWORD_else / KEYWORD_enum / KEYWORD_errdefer | 10157 | / KEYWORD_defer / KEYWORD_else / KEYWORD_enum / KEYWORD_errdefer |
src/parser.cpp-5
| ... | @@ -1519,7 +1519,6 @@ static AstNode *ast_parse_suffix_expr(ParseContext *pc) { | ... | @@ -1519,7 +1519,6 @@ static AstNode *ast_parse_suffix_expr(ParseContext *pc) { |
| 1519 | // / IDENTIFIER | 1519 | // / IDENTIFIER |
| 1520 | // / IfTypeExpr | 1520 | // / IfTypeExpr |
| 1521 | // / INTEGER | 1521 | // / INTEGER |
| 1522 | // / KEYWORD_anyerror | ||
| 1523 | // / KEYWORD_comptime TypeExpr | 1522 | // / KEYWORD_comptime TypeExpr |
| 1524 | // / KEYWORD_error DOT IDENTIFIER | 1523 | // / KEYWORD_error DOT IDENTIFIER |
| 1525 | // / KEYWORD_false | 1524 | // / KEYWORD_false |
| ... | @@ -1614,10 +1613,6 @@ static AstNode *ast_parse_primary_type_expr(ParseContext *pc) { | ... | @@ -1614,10 +1613,6 @@ static AstNode *ast_parse_primary_type_expr(ParseContext *pc) { |
| 1614 | return res; | 1613 | return res; |
| 1615 | } | 1614 | } |
| 1616 | 1615 | ||
| 1617 | Token *error_type = eat_token_if(pc, TokenIdKeywordAnyerror); | ||
| 1618 | if (error_type != nullptr) | ||
| 1619 | return ast_create_node(pc, NodeTypeErrorType, error_type); | ||
| 1620 | |||
| 1621 | Token *comptime = eat_token_if(pc, TokenIdKeywordCompTime); | 1616 | Token *comptime = eat_token_if(pc, TokenIdKeywordCompTime); |
| 1622 | if (comptime != nullptr) { | 1617 | if (comptime != nullptr) { |
| 1623 | AstNode *expr = ast_expect(pc, ast_parse_type_expr); | 1618 | AstNode *expr = ast_expect(pc, ast_parse_type_expr); |
src/tokenizer.cpp-2
| ... | @@ -109,7 +109,6 @@ static const struct ZigKeyword zig_keywords[] = { | ... | @@ -109,7 +109,6 @@ static const struct ZigKeyword zig_keywords[] = { |
| 109 | {"align", TokenIdKeywordAlign}, | 109 | {"align", TokenIdKeywordAlign}, |
| 110 | {"allowzero", TokenIdKeywordAllowZero}, | 110 | {"allowzero", TokenIdKeywordAllowZero}, |
| 111 | {"and", TokenIdKeywordAnd}, | 111 | {"and", TokenIdKeywordAnd}, |
| 112 | {"anyerror", TokenIdKeywordAnyerror}, | ||
| 113 | {"asm", TokenIdKeywordAsm}, | 112 | {"asm", TokenIdKeywordAsm}, |
| 114 | {"async", TokenIdKeywordAsync}, | 113 | {"async", TokenIdKeywordAsync}, |
| 115 | {"await", TokenIdKeywordAwait}, | 114 | {"await", TokenIdKeywordAwait}, |
| ... | @@ -1528,7 +1527,6 @@ const char * token_name(TokenId id) { | ... | @@ -1528,7 +1527,6 @@ const char * token_name(TokenId id) { |
| 1528 | case TokenIdFloatLiteral: return "FloatLiteral"; | 1527 | case TokenIdFloatLiteral: return "FloatLiteral"; |
| 1529 | case TokenIdIntLiteral: return "IntLiteral"; | 1528 | case TokenIdIntLiteral: return "IntLiteral"; |
| 1530 | case TokenIdKeywordAsync: return "async"; | 1529 | case TokenIdKeywordAsync: return "async"; |
| 1531 | case TokenIdKeywordAnyerror: return "anyerror"; | ||
| 1532 | case TokenIdKeywordAllowZero: return "allowzero"; | 1530 | case TokenIdKeywordAllowZero: return "allowzero"; |
| 1533 | case TokenIdKeywordAwait: return "await"; | 1531 | case TokenIdKeywordAwait: return "await"; |
| 1534 | case TokenIdKeywordResume: return "resume"; | 1532 | case TokenIdKeywordResume: return "resume"; |
src/tokenizer.hpp-1
| ... | @@ -53,7 +53,6 @@ enum TokenId { | ... | @@ -53,7 +53,6 @@ enum TokenId { |
| 53 | TokenIdKeywordAlign, | 53 | TokenIdKeywordAlign, |
| 54 | TokenIdKeywordAllowZero, | 54 | TokenIdKeywordAllowZero, |
| 55 | TokenIdKeywordAnd, | 55 | TokenIdKeywordAnd, |
| 56 | TokenIdKeywordAnyerror, | ||
| 57 | TokenIdKeywordAsm, | 56 | TokenIdKeywordAsm, |
| 58 | TokenIdKeywordAsync, | 57 | TokenIdKeywordAsync, |
| 59 | TokenIdKeywordAwait, | 58 | TokenIdKeywordAwait, |
std/zig/parse.zig-2
| ... | @@ -1197,7 +1197,6 @@ fn parseSuffixExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node { | ... | @@ -1197,7 +1197,6 @@ fn parseSuffixExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node { |
| 1197 | /// / IDENTIFIER | 1197 | /// / IDENTIFIER |
| 1198 | /// / IfTypeExpr | 1198 | /// / IfTypeExpr |
| 1199 | /// / INTEGER | 1199 | /// / INTEGER |
| 1200 | /// / KEYWORD_anyerror | ||
| 1201 | /// / KEYWORD_comptime TypeExpr | 1200 | /// / KEYWORD_comptime TypeExpr |
| 1202 | /// / KEYWORD_error DOT IDENTIFIER | 1201 | /// / KEYWORD_error DOT IDENTIFIER |
| 1203 | /// / KEYWORD_false | 1202 | /// / KEYWORD_false |
| ... | @@ -1228,7 +1227,6 @@ fn parsePrimaryTypeExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*N | ... | @@ -1228,7 +1227,6 @@ fn parsePrimaryTypeExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*N |
| 1228 | if (try parseIdentifier(arena, it, tree)) |node| return node; | 1227 | if (try parseIdentifier(arena, it, tree)) |node| return node; |
| 1229 | if (try parseIfTypeExpr(arena, it, tree)) |node| return node; | 1228 | if (try parseIfTypeExpr(arena, it, tree)) |node| return node; |
| 1230 | if (try parseIntegerLiteral(arena, it, tree)) |node| return node; | 1229 | if (try parseIntegerLiteral(arena, it, tree)) |node| return node; |
| 1231 | if (eatToken(it, .Keyword_anyerror)) |token| return createLiteral(arena, Node.ErrorType, token); | ||
| 1232 | if (eatToken(it, .Keyword_comptime)) |token| { | 1230 | if (eatToken(it, .Keyword_comptime)) |token| { |
| 1233 | const expr = (try parseTypeExpr(arena, it, tree)) orelse return null; | 1231 | const expr = (try parseTypeExpr(arena, it, tree)) orelse return null; |
| 1234 | const node = try arena.create(Node.Comptime); | 1232 | const node = try arena.create(Node.Comptime); |
std/zig/tokenizer.zig-2
| ... | @@ -15,7 +15,6 @@ pub const Token = struct { | ... | @@ -15,7 +15,6 @@ pub const Token = struct { |
| 15 | Keyword{ .bytes = "align", .id = Id.Keyword_align }, | 15 | Keyword{ .bytes = "align", .id = Id.Keyword_align }, |
| 16 | Keyword{ .bytes = "allowzero", .id = Id.Keyword_allowzero }, | 16 | Keyword{ .bytes = "allowzero", .id = Id.Keyword_allowzero }, |
| 17 | Keyword{ .bytes = "and", .id = Id.Keyword_and }, | 17 | Keyword{ .bytes = "and", .id = Id.Keyword_and }, |
| 18 | Keyword{ .bytes = "anyerror", .id = Id.Keyword_anyerror }, | ||
| 19 | Keyword{ .bytes = "asm", .id = Id.Keyword_asm }, | 18 | Keyword{ .bytes = "asm", .id = Id.Keyword_asm }, |
| 20 | Keyword{ .bytes = "async", .id = Id.Keyword_async }, | 19 | Keyword{ .bytes = "async", .id = Id.Keyword_async }, |
| 21 | Keyword{ .bytes = "await", .id = Id.Keyword_await }, | 20 | Keyword{ .bytes = "await", .id = Id.Keyword_await }, |
| ... | @@ -147,7 +146,6 @@ pub const Token = struct { | ... | @@ -147,7 +146,6 @@ pub const Token = struct { |
| 147 | Keyword_align, | 146 | Keyword_align, |
| 148 | Keyword_allowzero, | 147 | Keyword_allowzero, |
| 149 | Keyword_and, | 148 | Keyword_and, |
| 150 | Keyword_anyerror, | ||
| 151 | Keyword_asm, | 149 | Keyword_asm, |
| 152 | Keyword_async, | 150 | Keyword_async, |
| 153 | Keyword_await, | 151 | Keyword_await, |