Simplify parser logic for field prefixes

2 files changed, 23 insertions, 34 deletions

diff --git a/src/parser.cpp b/src/parser.cpp
index b62ec7a74..934b5afcd 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -3550,49 +3550,34 @@ Ast *parse_var_type(AstFile *f, bool allow_ellipsis, bool allow_typeid_token) {
 }
 
 
-enum FieldPrefixKind : i32 {
-	FieldPrefix_Unknown = -1,
-	FieldPrefix_Invalid = 0,
-
-	FieldPrefix_using, // implies #subtype
-	FieldPrefix_const,
-	FieldPrefix_no_alias,
-	FieldPrefix_c_vararg,
-	FieldPrefix_auto_cast,
-	FieldPrefix_any_int,
-	FieldPrefix_subtype, // does not imply `using` semantics
-	FieldPrefix_by_ptr,
-};
-
 struct ParseFieldPrefixMapping {
 	String          name;
 	TokenKind       token_kind;
-	FieldPrefixKind prefix;
 	FieldFlag       flag;
 };
 
 gb_global ParseFieldPrefixMapping parse_field_prefix_mappings[] = {
-	{str_lit("using"),      Token_using,     FieldPrefix_using,     FieldFlag_using},
-	{str_lit("auto_cast"),  Token_auto_cast, FieldPrefix_auto_cast, FieldFlag_auto_cast},
-	{str_lit("no_alias"),   Token_Hash,      FieldPrefix_no_alias,  FieldFlag_no_alias},
-	{str_lit("c_vararg"),   Token_Hash,      FieldPrefix_c_vararg,  FieldFlag_c_vararg},
-	{str_lit("const"),      Token_Hash,      FieldPrefix_const,     FieldFlag_const},
-	{str_lit("any_int"),    Token_Hash,      FieldPrefix_any_int,   FieldFlag_any_int},
-	{str_lit("subtype"),    Token_Hash,      FieldPrefix_subtype,   FieldFlag_subtype},
-	{str_lit("by_ptr"),     Token_Hash,      FieldPrefix_by_ptr,    FieldFlag_by_ptr},
+	{str_lit("using"),      Token_using,     FieldFlag_using},
+	{str_lit("auto_cast"),  Token_auto_cast, FieldFlag_auto_cast},
+	{str_lit("no_alias"),   Token_Hash,      FieldFlag_no_alias},
+	{str_lit("c_vararg"),   Token_Hash,      FieldFlag_c_vararg},
+	{str_lit("const"),      Token_Hash,      FieldFlag_const},
+	{str_lit("any_int"),    Token_Hash,      FieldFlag_any_int},
+	{str_lit("subtype"),    Token_Hash,      FieldFlag_subtype},
+	{str_lit("by_ptr"),     Token_Hash,      FieldFlag_by_ptr},
 };
 
 
-FieldPrefixKind is_token_field_prefix(AstFile *f) {
+FieldFlag is_token_field_prefix(AstFile *f) {
 	switch (f->curr_token.kind) {
 	case Token_EOF:
-		return FieldPrefix_Invalid;
+		return FieldFlag_Invalid;
 
 	case Token_using:
-		return FieldPrefix_using;
+		return FieldFlag_using;
 
 	case Token_auto_cast:
-		return FieldPrefix_auto_cast;
+		return FieldFlag_auto_cast;
 
 	case Token_Hash:
 		advance_token(f);
@@ -3602,33 +3587,33 @@ FieldPrefixKind is_token_field_prefix(AstFile *f) {
 				auto const &mapping = parse_field_prefix_mappings[i];
 				if (mapping.token_kind == Token_Hash) {
 					if (f->curr_token.string == mapping.name) {
-						return mapping.prefix;
+						return mapping.flag;
 					}
 				}
 			}
 			break;
 		}
-		return FieldPrefix_Unknown;
+		return FieldFlag_Unknown;
 	}
-	return FieldPrefix_Invalid;
+	return FieldFlag_Invalid;
 }
 
 u32 parse_field_prefixes(AstFile *f) {
 	i32 counts[gb_count_of(parse_field_prefix_mappings)] = {};
 
 	for (;;) {
-		FieldPrefixKind kind = is_token_field_prefix(f);
-		if (kind == FieldPrefix_Invalid) {
+		FieldFlag flag = is_token_field_prefix(f);
+		if (flag & FieldFlag_Invalid) {
 			break;
 		}
-		if (kind == FieldPrefix_Unknown) {
+		if (flag & FieldFlag_Unknown) {
 			syntax_error(f->curr_token, "Unknown prefix kind '#%.*s'", LIT(f->curr_token.string));
 			advance_token(f);
 			continue;
 		}
 
 		for (i32 i = 0; i < gb_count_of(parse_field_prefix_mappings); i++) {
-			if (parse_field_prefix_mappings[i].prefix == kind) {
+			if (parse_field_prefix_mappings[i].flag == flag) {
 				counts[i] += 1;
 				advance_token(f);
 				break;
diff --git a/src/parser.hpp b/src/parser.hpp
index 3126e0a02..862ef0f77 100644
--- a/src/parser.hpp
+++ b/src/parser.hpp
@@ -308,6 +308,10 @@ enum FieldFlag : u32 {
 	FieldFlag_Tags      = 1<<10,
 	FieldFlag_Results   = 1<<16,
 
+
+	FieldFlag_Unknown   = 1u<<30,
+	FieldFlag_Invalid   = 1u<<31,
+
 	// Parameter List Restrictions
 	FieldFlag_Signature = FieldFlag_ellipsis|FieldFlag_using|FieldFlag_no_alias|FieldFlag_c_vararg|FieldFlag_auto_cast|FieldFlag_const|FieldFlag_any_int|FieldFlag_by_ptr,
 	FieldFlag_Struct    = FieldFlag_using|FieldFlag_subtype|FieldFlag_Tags,