diff options
| author | Brendan Punsky <bpunsky@gmail.com> | 2019-03-13 16:45:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 16:45:46 -0400 |
| commit | eadb66c9efc19ad1deaee6ca5a141cbd7206fcce (patch) | |
| tree | 01eb1a33ffba203c45460e0e50da4b5f4ca31076 /src/tokenizer.cpp | |
| parent | 9d7e1c17cc4a9b0d6cfd4c741c800b5732eb9948 (diff) | |
| parent | bdab5e00da6dee80b7582135815f2183def935bb (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/tokenizer.cpp')
| -rw-r--r-- | src/tokenizer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp index 02770e371..d7a39e824 100644 --- a/src/tokenizer.cpp +++ b/src/tokenizer.cpp @@ -82,7 +82,6 @@ TOKEN_KIND(Token__OperatorEnd, ""), \ \ TOKEN_KIND(Token__KeywordBegin, ""), \ TOKEN_KIND(Token_import, "import"), \ - TOKEN_KIND(Token_export, "export"), \ TOKEN_KIND(Token_foreign, "foreign"), \ TOKEN_KIND(Token_package, "package"), \ TOKEN_KIND(Token_typeid, "typeid"), \ @@ -101,14 +100,12 @@ TOKEN_KIND(Token__KeywordBegin, ""), \ TOKEN_KIND(Token_defer, "defer"), \ TOKEN_KIND(Token_return, "return"), \ TOKEN_KIND(Token_proc, "proc"), \ - TOKEN_KIND(Token_macro, "macro"), \ TOKEN_KIND(Token_struct, "struct"), \ TOKEN_KIND(Token_union, "union"), \ TOKEN_KIND(Token_enum, "enum"), \ TOKEN_KIND(Token_bit_field, "bit_field"), \ TOKEN_KIND(Token_bit_set, "bit_set"), \ TOKEN_KIND(Token_map, "map"), \ - TOKEN_KIND(Token_static, "static"), \ TOKEN_KIND(Token_dynamic, "dynamic"), \ TOKEN_KIND(Token_auto_cast, "auto_cast"), \ TOKEN_KIND(Token_cast, "cast"), \ @@ -123,6 +120,7 @@ TOKEN_KIND(Token__KeywordBegin, ""), \ TOKEN_KIND(Token_align_of, "align_of"), \ TOKEN_KIND(Token_offset_of, "offset_of"), \ TOKEN_KIND(Token_type_of, "type_of"), \ + TOKEN_KIND(Token_macro, "macro"), \ TOKEN_KIND(Token_const, "const"), \ TOKEN_KIND(Token_asm, "asm"), \ TOKEN_KIND(Token_yield, "yield"), \ |