authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-07-07 09:44:48-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2019-07-07 09:44:48-04:00
loge12eb5e7f6d257323adf949c9c850323b9d4ebba
treebc1d6ce1d379d64243b1ba4129a73e9544f1c91d
parentb118806c69e44029a7af9c9b8bdfa9cdcd280260
parent28b59a0be716a2d9ef0fc365ee51b834199503e1
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #2835 from hryx/de-keyword-anyerror

Make anyerror not a keyword

7 files changed, 1 insertions(+), 16 deletions(-)

doc/docgen.zig-1
......@@ -746,7 +746,6 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok
746746
747747 std.zig.Token.Id.Keyword_align,
748748 std.zig.Token.Id.Keyword_and,
749 std.zig.Token.Id.Keyword_anyerror,
750749 std.zig.Token.Id.Keyword_asm,
751750 std.zig.Token.Id.Keyword_async,
752751 std.zig.Token.Id.Keyword_await,
doc/langref.html.in+1-3
......@@ -9798,7 +9798,6 @@ PrimaryTypeExpr
97989798 / IDENTIFIER
97999799 / IfTypeExpr
98009800 / INTEGER
9801 / KEYWORD_anyerror
98029801 / KEYWORD_comptime TypeExpr
98039802 / KEYWORD_error DOT IDENTIFIER
98049803 / KEYWORD_false
......@@ -10104,7 +10103,6 @@ end_of_word &lt;- ![a-zA-Z0-9_] skip
1010410103KEYWORD_align &lt;- 'align' end_of_word
1010510104KEYWORD_allowzero &lt;- 'allowzero' end_of_word
1010610105KEYWORD_and &lt;- 'and' end_of_word
10107KEYWORD_anyerror &lt;- 'anyerror' end_of_word
1010810106KEYWORD_asm &lt;- 'asm' end_of_word
1010910107KEYWORD_async &lt;- 'async' end_of_word
1011010108KEYWORD_await &lt;- 'await' end_of_word
......@@ -10153,7 +10151,7 @@ KEYWORD_var &lt;- 'var' end_of_word
1015310151KEYWORD_volatile &lt;- 'volatile' end_of_word
1015410152KEYWORD_while &lt;- 'while' end_of_word
1015510153
10156keyword &lt;- KEYWORD_align / KEYWORD_and / KEYWORD_allowzero / KEYWORD_anyerror / KEYWORD_asm
10154keyword &lt;- KEYWORD_align / KEYWORD_and / KEYWORD_allowzero / KEYWORD_asm
1015710155 / KEYWORD_async / KEYWORD_await / KEYWORD_break / KEYWORD_cancel
1015810156 / KEYWORD_catch / KEYWORD_comptime / KEYWORD_const / KEYWORD_continue
1015910157 / KEYWORD_defer / KEYWORD_else / KEYWORD_enum / KEYWORD_errdefer
src/parser.cpp-5
......@@ -1519,7 +1519,6 @@ static AstNode *ast_parse_suffix_expr(ParseContext *pc) {
15191519// / IDENTIFIER
15201520// / IfTypeExpr
15211521// / INTEGER
1522// / KEYWORD_anyerror
15231522// / KEYWORD_comptime TypeExpr
15241523// / KEYWORD_error DOT IDENTIFIER
15251524// / KEYWORD_false
......@@ -1614,10 +1613,6 @@ static AstNode *ast_parse_primary_type_expr(ParseContext *pc) {
16141613 return res;
16151614 }
16161615
1617 Token *error_type = eat_token_if(pc, TokenIdKeywordAnyerror);
1618 if (error_type != nullptr)
1619 return ast_create_node(pc, NodeTypeErrorType, error_type);
1620
16211616 Token *comptime = eat_token_if(pc, TokenIdKeywordCompTime);
16221617 if (comptime != nullptr) {
16231618 AstNode *expr = ast_expect(pc, ast_parse_type_expr);
src/tokenizer.cpp-2
......@@ -109,7 +109,6 @@ static const struct ZigKeyword zig_keywords[] = {
109109 {"align", TokenIdKeywordAlign},
110110 {"allowzero", TokenIdKeywordAllowZero},
111111 {"and", TokenIdKeywordAnd},
112 {"anyerror", TokenIdKeywordAnyerror},
113112 {"asm", TokenIdKeywordAsm},
114113 {"async", TokenIdKeywordAsync},
115114 {"await", TokenIdKeywordAwait},
......@@ -1528,7 +1527,6 @@ const char * token_name(TokenId id) {
15281527 case TokenIdFloatLiteral: return "FloatLiteral";
15291528 case TokenIdIntLiteral: return "IntLiteral";
15301529 case TokenIdKeywordAsync: return "async";
1531 case TokenIdKeywordAnyerror: return "anyerror";
15321530 case TokenIdKeywordAllowZero: return "allowzero";
15331531 case TokenIdKeywordAwait: return "await";
15341532 case TokenIdKeywordResume: return "resume";
src/tokenizer.hpp-1
......@@ -53,7 +53,6 @@ enum TokenId {
5353 TokenIdKeywordAlign,
5454 TokenIdKeywordAllowZero,
5555 TokenIdKeywordAnd,
56 TokenIdKeywordAnyerror,
5756 TokenIdKeywordAsm,
5857 TokenIdKeywordAsync,
5958 TokenIdKeywordAwait,
std/zig/parse.zig-2
......@@ -1197,7 +1197,6 @@ fn parseSuffixExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
11971197/// / IDENTIFIER
11981198/// / IfTypeExpr
11991199/// / INTEGER
1200/// / KEYWORD_anyerror
12011200/// / KEYWORD_comptime TypeExpr
12021201/// / KEYWORD_error DOT IDENTIFIER
12031202/// / KEYWORD_false
......@@ -1228,7 +1227,6 @@ fn parsePrimaryTypeExpr(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*N
12281227 if (try parseIdentifier(arena, it, tree)) |node| return node;
12291228 if (try parseIfTypeExpr(arena, it, tree)) |node| return node;
12301229 if (try parseIntegerLiteral(arena, it, tree)) |node| return node;
1231 if (eatToken(it, .Keyword_anyerror)) |token| return createLiteral(arena, Node.ErrorType, token);
12321230 if (eatToken(it, .Keyword_comptime)) |token| {
12331231 const expr = (try parseTypeExpr(arena, it, tree)) orelse return null;
12341232 const node = try arena.create(Node.Comptime);
std/zig/tokenizer.zig-2
......@@ -15,7 +15,6 @@ pub const Token = struct {
1515 Keyword{ .bytes = "align", .id = Id.Keyword_align },
1616 Keyword{ .bytes = "allowzero", .id = Id.Keyword_allowzero },
1717 Keyword{ .bytes = "and", .id = Id.Keyword_and },
18 Keyword{ .bytes = "anyerror", .id = Id.Keyword_anyerror },
1918 Keyword{ .bytes = "asm", .id = Id.Keyword_asm },
2019 Keyword{ .bytes = "async", .id = Id.Keyword_async },
2120 Keyword{ .bytes = "await", .id = Id.Keyword_await },
......@@ -147,7 +146,6 @@ pub const Token = struct {
147146 Keyword_align,
148147 Keyword_allowzero,
149148 Keyword_and,
150 Keyword_anyerror,
151149 Keyword_asm,
152150 Keyword_async,
153151 Keyword_await,