diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-11-17 02:18:56 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-11-17 02:18:56 -0500 |
| commit | c21884e1d64e4193e03be4f3064917a26b34b142 (patch) | |
| tree | 91e09e1df556e260ea2f1b171eaa05bd30646e1f /src/tokenizer.cpp | |
| parent | 2928b01afc5f0d84669ac6a70eedab4117d805f3 (diff) | |
| parent | 704374e51294e14285b0b54030c1cb6154868098 (diff) | |
| download | zig-c21884e1d64e4193e03be4f3064917a26b34b142.tar.gz zig-c21884e1d64e4193e03be4f3064917a26b34b142.zip | |
Merge remote-tracking branch 'origin/master' into llvm8
Diffstat (limited to 'src/tokenizer.cpp')
| -rw-r--r-- | src/tokenizer.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp index ebe1b07359..921ee4de09 100644 --- a/src/tokenizer.cpp +++ b/src/tokenizer.cpp @@ -108,6 +108,7 @@ struct ZigKeyword { static const struct ZigKeyword zig_keywords[] = { {"align", TokenIdKeywordAlign}, {"and", TokenIdKeywordAnd}, + {"anyerror", TokenIdKeywordAnyerror}, {"asm", TokenIdKeywordAsm}, {"async", TokenIdKeywordAsync}, {"await", TokenIdKeywordAwait}, @@ -139,7 +140,7 @@ static const struct ZigKeyword zig_keywords[] = { {"pub", TokenIdKeywordPub}, {"resume", TokenIdKeywordResume}, {"return", TokenIdKeywordReturn}, - {"section", TokenIdKeywordSection}, + {"linksection", TokenIdKeywordLinkSection}, {"stdcallcc", TokenIdKeywordStdcallCC}, {"struct", TokenIdKeywordStruct}, {"suspend", TokenIdKeywordSuspend}, @@ -1548,6 +1549,7 @@ const char * token_name(TokenId id) { case TokenIdFloatLiteral: return "FloatLiteral"; case TokenIdIntLiteral: return "IntLiteral"; case TokenIdKeywordAsync: return "async"; + case TokenIdKeywordAnyerror: return "anyerror"; case TokenIdKeywordAwait: return "await"; case TokenIdKeywordResume: return "resume"; case TokenIdKeywordSuspend: return "suspend"; @@ -1581,7 +1583,7 @@ const char * token_name(TokenId id) { case TokenIdKeywordPromise: return "promise"; case TokenIdKeywordPub: return "pub"; case TokenIdKeywordReturn: return "return"; - case TokenIdKeywordSection: return "section"; + case TokenIdKeywordLinkSection: return "linksection"; case TokenIdKeywordStdcallCC: return "stdcallcc"; case TokenIdKeywordStruct: return "struct"; case TokenIdKeywordSwitch: return "switch"; @@ -1625,6 +1627,8 @@ const char * token_name(TokenId id) { case TokenIdTimesPercent: return "*%"; case TokenIdTimesPercentEq: return "*%="; case TokenIdBarBarEq: return "||="; + case TokenIdCount: + zig_unreachable(); } return "(invalid token)"; } |