From 21cbac755ec2e18e5471c8f8e1406a87156d8043 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 15 Aug 2021 17:14:35 +0100 Subject: Make `or_else` and `or_return` operators (binary and suffix respectively) --- src/tokenizer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/tokenizer.cpp') diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp index e33c945bc..ad70905f0 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, "") -- cgit v1.2.3 From b8661e0ae01eae2ab8a3475006f0f5c3f099f987 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 15 Aug 2021 17:16:37 +0100 Subject: Update semi-colon insertion rules for `or_return` --- src/tokenizer.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/tokenizer.cpp') diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp index ad70905f0..8772890d9 100644 --- a/src/tokenizer.cpp +++ b/src/tokenizer.cpp @@ -1510,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: -- cgit v1.2.3