diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-01-06 18:53:17 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-01-06 18:53:17 -0500 |
| commit | 633b6bf92055a62f8a18dbfdb1ddc4f7330bf4ec (patch) | |
| tree | 3be9c09b1e6c0c3aff43fdc3d6d98948756de023 /src/tokenizer.hpp | |
| parent | 4e6ad8efd9fcefb820acf4a03fc4ab9157f85c1b (diff) | |
| parent | c0e8837ce9168088e89bfeef9516d7318cd5f97d (diff) | |
| download | zig-633b6bf92055a62f8a18dbfdb1ddc4f7330bf4ec.tar.gz zig-633b6bf92055a62f8a18dbfdb1ddc4f7330bf4ec.zip | |
Merge branch 'LemonBoy-cc-work'
Diffstat (limited to 'src/tokenizer.hpp')
| -rw-r--r-- | src/tokenizer.hpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tokenizer.hpp b/src/tokenizer.hpp index 084512a576..a893cc2373 100644 --- a/src/tokenizer.hpp +++ b/src/tokenizer.hpp @@ -59,6 +59,7 @@ enum TokenId { TokenIdKeywordAwait, TokenIdKeywordBreak, TokenIdKeywordCatch, + TokenIdKeywordCallconv, TokenIdKeywordCompTime, TokenIdKeywordConst, TokenIdKeywordContinue, @@ -76,7 +77,6 @@ enum TokenId { TokenIdKeywordInline, TokenIdKeywordNoInline, TokenIdKeywordLinkSection, - TokenIdKeywordNakedCC, TokenIdKeywordNoAlias, TokenIdKeywordNoAsync, TokenIdKeywordNull, @@ -86,7 +86,6 @@ enum TokenId { TokenIdKeywordPub, TokenIdKeywordResume, TokenIdKeywordReturn, - TokenIdKeywordStdcallCC, TokenIdKeywordStruct, TokenIdKeywordSuspend, TokenIdKeywordSwitch, |