Syntactic sugar for anonymous enum within a bit set

1 files changed, 22 insertions, 12 deletions

diff --git a/src/parser.cpp b/src/parser.cpp
index a162a4ee3..f029e7159 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -2038,22 +2038,32 @@ Ast *parse_operand(AstFile *f, bool lhs) {
 
 	case Token_bit_set: {
 		Token token = expect_token(f, Token_bit_set);
-		Token open  = expect_token(f, Token_OpenBracket);
 
-		Ast *elem = nullptr;
-		Ast *underlying = nullptr;
+		if (f->curr_token.kind == Token_OpenBrace) {
+			Token open = expect_token(f, Token_OpenBrace);
 
-		bool prev_allow_range = f->allow_range;
-		f->allow_range = true;
-		elem = parse_expr(f, false);
-		f->allow_range = prev_allow_range;
-		if (allow_token(f, Token_Semicolon)) {
-			underlying = parse_type(f);
-		}
+			Array<Ast *> values = parse_element_list(f);
+			Token close = expect_token(f, Token_CloseBrace);
+			Ast *enum_type = ast_enum_type(f, token, nullptr, values);
+
+			return ast_bit_set_type(f, token, enum_type, nullptr);
+		} else {
+			expect_token(f, Token_OpenBracket);
 
-		Token close = expect_token(f, Token_CloseBracket);
+			Ast *elem = nullptr;
+			Ast *underlying = nullptr;
 
-		return ast_bit_set_type(f, token, elem, underlying);
+			bool prev_allow_range = f->allow_range;
+			f->allow_range = true;
+			elem = parse_expr(f, false);
+			f->allow_range = prev_allow_range;
+			if (allow_token(f, Token_Semicolon)) {
+				underlying = parse_type(f);
+			}
+
+			expect_token(f, Token_CloseBracket);
+			return ast_bit_set_type(f, token, elem, underlying);
+		}
 	}
 
 	default: {