diff options
| author | Vexu <15308111+Vexu@users.noreply.github.com> | 2019-08-16 17:40:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 17:40:20 +0300 |
| commit | 92a81252cbd8e2576930a0575e939ed4c26f3c29 (patch) | |
| tree | 84a63ec3118a07e7116200b39616c82c43451ccb /src/tokenizer.cpp | |
| parent | 34d2a1465c1b4869b70df07d735b0364506d484d (diff) | |
| parent | 49c88e23af6fe1dc895544f91231cc3b53110c8e (diff) | |
| download | zig-92a81252cbd8e2576930a0575e939ed4c26f3c29.tar.gz zig-92a81252cbd8e2576930a0575e939ed4c26f3c29.zip | |
Merge branch 'master' into fmt-comment-fix
Diffstat (limited to 'src/tokenizer.cpp')
| -rw-r--r-- | src/tokenizer.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp index 783b6e0e20..84f3f2c0ec 100644 --- a/src/tokenizer.cpp +++ b/src/tokenizer.cpp @@ -109,11 +109,11 @@ static const struct ZigKeyword zig_keywords[] = { {"align", TokenIdKeywordAlign}, {"allowzero", TokenIdKeywordAllowZero}, {"and", TokenIdKeywordAnd}, + {"anyframe", TokenIdKeywordAnyFrame}, {"asm", TokenIdKeywordAsm}, {"async", TokenIdKeywordAsync}, {"await", TokenIdKeywordAwait}, {"break", TokenIdKeywordBreak}, - {"cancel", TokenIdKeywordCancel}, {"catch", TokenIdKeywordCatch}, {"comptime", TokenIdKeywordCompTime}, {"const", TokenIdKeywordConst}, @@ -136,7 +136,6 @@ static const struct ZigKeyword zig_keywords[] = { {"or", TokenIdKeywordOr}, {"orelse", TokenIdKeywordOrElse}, {"packed", TokenIdKeywordPacked}, - {"promise", TokenIdKeywordPromise}, {"pub", TokenIdKeywordPub}, {"resume", TokenIdKeywordResume}, {"return", TokenIdKeywordReturn}, @@ -1531,9 +1530,9 @@ const char * token_name(TokenId id) { case TokenIdKeywordAwait: return "await"; case TokenIdKeywordResume: return "resume"; case TokenIdKeywordSuspend: return "suspend"; - case TokenIdKeywordCancel: return "cancel"; case TokenIdKeywordAlign: return "align"; case TokenIdKeywordAnd: return "and"; + case TokenIdKeywordAnyFrame: return "anyframe"; case TokenIdKeywordAsm: return "asm"; case TokenIdKeywordBreak: return "break"; case TokenIdKeywordCatch: return "catch"; @@ -1558,7 +1557,6 @@ const char * token_name(TokenId id) { case TokenIdKeywordOr: return "or"; case TokenIdKeywordOrElse: return "orelse"; case TokenIdKeywordPacked: return "packed"; - case TokenIdKeywordPromise: return "promise"; case TokenIdKeywordPub: return "pub"; case TokenIdKeywordReturn: return "return"; case TokenIdKeywordLinkSection: return "linksection"; |