diff options
| author | Josh Wolfe <thejoshwolfe@gmail.com> | 2015-11-29 14:52:49 -0700 |
|---|---|---|
| committer | Josh Wolfe <thejoshwolfe@gmail.com> | 2015-11-29 14:52:49 -0700 |
| commit | 30442ed893c4477851d37c865eb978c4bf27c814 (patch) | |
| tree | 406d86f58bcda7ab68affb8c37c6787854338884 /src/tokenizer.cpp | |
| parent | 9a014b52ccc22d7ec24804f90993cfe08e3d20c4 (diff) | |
| parent | c1d77f2a231461d88ad493c92079cc571e565f87 (diff) | |
| download | zig-30442ed893c4477851d37c865eb978c4bf27c814.tar.gz zig-30442ed893c4477851d37c865eb978c4bf27c814.zip | |
merge conflicts
Diffstat (limited to 'src/tokenizer.cpp')
| -rw-r--r-- | src/tokenizer.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp index 1852dbf142..3cfab3288a 100644 --- a/src/tokenizer.cpp +++ b/src/tokenizer.cpp @@ -249,6 +249,10 @@ ZigList<Token> *tokenize(Buf *buf) { begin_token(&t, TokenIdPlus); end_token(&t); break; + case '~': + begin_token(&t, TokenIdTilde); + end_token(&t); + break; case '-': begin_token(&t, TokenIdDash); t.state = TokenizeStateSawDash; @@ -278,7 +282,7 @@ ZigList<Token> *tokenize(Buf *buf) { t.state = TokenizeStateEq; break; case '!': - begin_token(&t, TokenIdNot); + begin_token(&t, TokenIdBang); t.state = TokenizeStateBang; break; case '<': @@ -578,7 +582,8 @@ static const char * token_name(Token *token) { case TokenIdBoolOr: return "BoolOr"; case TokenIdBoolAnd: return "BoolAnd"; case TokenIdEq: return "Eq"; - case TokenIdNot: return "Not"; + case TokenIdBang: return "Bang"; + case TokenIdTilde: return "Tilde"; case TokenIdCmpEq: return "CmpEq"; case TokenIdCmpNotEq: return "CmpNotEq"; case TokenIdCmpLessThan: return "CmpLessThan"; |