diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2021-08-16 12:03:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-16 12:03:43 +0100 |
| commit | 5f072591ba70abf6df59f4ed9372649e7ebda710 (patch) | |
| tree | 8c9d02259b75be22736d65d4a595ee933a26a259 /src/tokenizer.cpp | |
| parent | d62f189d7261160a2d3c66bfba2fda182a863fbd (diff) | |
| parent | e3fef2dadef2b10342222f0314583f6f53e39ff4 (diff) | |
Merge pull request #1082 from odin-lang/or_else-or_return-operator
`or_else` and `or_return` operators
Diffstat (limited to 'src/tokenizer.cpp')
| -rw-r--r-- | src/tokenizer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp index e33c945bc..8772890d9 100644 --- a/src/tokenizer.cpp +++ b/src/tokenizer.cpp @@ -113,10 +113,12 @@ TOKEN_KIND(Token__KeywordBegin, ""), \ TOKEN_KIND(Token_transmute, "transmute"), \ TOKEN_KIND(Token_distinct, "distinct"), \ TOKEN_KIND(Token_using, "using"), \ - TOKEN_KIND(Token_inline, "inline"), \ - TOKEN_KIND(Token_no_inline, "no_inline"), \ TOKEN_KIND(Token_context, "context"), \ + TOKEN_KIND(Token_or_else, "or_else"), \ + TOKEN_KIND(Token_or_return, "or_return"), \ TOKEN_KIND(Token_asm, "asm"), \ + TOKEN_KIND(Token_inline, "inline"), \ + TOKEN_KIND(Token_no_inline, "no_inline"), \ TOKEN_KIND(Token__KeywordEnd, ""), \ TOKEN_KIND(Token_Count, "") @@ -1508,6 +1510,7 @@ semicolon_check:; case Token_continue: case Token_fallthrough: case Token_return: + case Token_or_return: /*fallthrough*/ case Token_Integer: case Token_Float: |