aboutsummaryrefslogtreecommitdiff
path: root/src/tokenizer.cpp
diff options
context:
space:
mode:
authorGinger Bill <bill@gingerbill.org>2016-10-16 21:31:06 +0100
committerGinger Bill <bill@gingerbill.org>2016-10-16 21:31:06 +0100
commita675d3f94d2c10ce6e50b88c6c39b36c746a4d2a (patch)
tree5ef34075438257fea6ef161e90ac403fd95663fd /src/tokenizer.cpp
parentb9719df0ad97eea1ba67525a9ab1d3c89e95ee8c (diff)
union_cast
Diffstat (limited to 'src/tokenizer.cpp')
-rw-r--r--src/tokenizer.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index f7a4d5cf1..0dfab6fc6 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -30,9 +30,10 @@ TOKEN_KIND(Token__OperatorBegin, "_OperatorBegin"), \
TOKEN_KIND(Token_Shl, "<<"), \
TOKEN_KIND(Token_Shr, ">>"), \
\
- TOKEN_KIND(Token_as, "as"), \
- TOKEN_KIND(Token_transmute, "transmute"), \
- TOKEN_KIND(Token_down_cast, "down_cast"), \
+ TOKEN_KIND(Token_as, "as"), \
+ TOKEN_KIND(Token_transmute, "transmute"), \
+ TOKEN_KIND(Token_down_cast, "down_cast"), \
+ TOKEN_KIND(Token_union_cast, "union_cast"), \
\
TOKEN_KIND(Token_Prime, "'"), \
TOKEN_KIND(Token_DoublePrime, "''"), \
@@ -635,6 +636,8 @@ Token tokenizer_get_token(Tokenizer *t) {
token.kind = Token_transmute;
} else if (token.string == token_strings[Token_down_cast]) {
token.kind = Token_down_cast;
+ } else if (token.string == token_strings[Token_union_cast]) {
+ token.kind = Token_union_cast;
} else {
for (i32 k = Token__KeywordBegin+1; k < Token__KeywordEnd; k++) {
if (token.string == token_strings[k]) {