diff options
| author | Vexu <15308111+Vexu@users.noreply.github.com> | 2019-08-16 20:02:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 20:02:47 +0300 |
| commit | c3407ed09775926d60cf3657a0d4fd6048cc6077 (patch) | |
| tree | bc9ba2bcd5569973986d692cbb5c24ffe19342eb /src/tokenizer.cpp | |
| parent | f8e753e19c013cc605a951e5038b4a26099aa135 (diff) | |
| parent | 2cb1f93894be3f48f0c49004515fa5e8190f69d9 (diff) | |
| download | zig-c3407ed09775926d60cf3657a0d4fd6048cc6077.tar.gz zig-c3407ed09775926d60cf3657a0d4fd6048cc6077.zip | |
Merge branch 'master' into comment-in-array
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"; |