diff options
| author | Josh Wolfe <thejoshwolfe@gmail.com> | 2015-11-30 22:12:21 -0700 |
|---|---|---|
| committer | Josh Wolfe <thejoshwolfe@gmail.com> | 2015-11-30 22:12:21 -0700 |
| commit | 00f4c05784c05552e1e379b98c09161c936cfb31 (patch) | |
| tree | 5b2234cae585c5ac3a2cb23503908b0a6e2a27e3 /src/tokenizer.cpp | |
| parent | abbc3957019c3a12dacd54869ff18b91c3f07699 (diff) | |
| parent | 55b8472374eede496b59396dbe253b05b16063e1 (diff) | |
| download | zig-00f4c05784c05552e1e379b98c09161c936cfb31.tar.gz zig-00f4c05784c05552e1e379b98c09161c936cfb31.zip | |
merge conflicts
Diffstat (limited to 'src/tokenizer.cpp')
| -rw-r--r-- | src/tokenizer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp index 3e8a201f52..94f3966f0f 100644 --- a/src/tokenizer.cpp +++ b/src/tokenizer.cpp @@ -180,6 +180,8 @@ static void end_token(Tokenize *t) { t->cur_tok->id = TokenIdKeywordExport; } else if (mem_eql_str(token_mem, token_len, "as")) { t->cur_tok->id = TokenIdKeywordAs; + } else if (mem_eql_str(token_mem, token_len, "use")) { + t->cur_tok->id = TokenIdKeywordUse; } t->cur_tok = nullptr; @@ -562,6 +564,7 @@ static const char * token_name(Token *token) { case TokenIdKeywordPub: return "Pub"; case TokenIdKeywordExport: return "Export"; case TokenIdKeywordAs: return "As"; + case TokenIdKeywordUse: return "Use"; case TokenIdLParen: return "LParen"; case TokenIdRParen: return "RParen"; case TokenIdComma: return "Comma"; |