From 97acc57649924e3ce1c9a3c8d18f954df9d24bb1 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Mon, 1 Aug 2022 13:17:10 +0100
Subject: [PATCH] Simplify field prefix handling

---
 core/odin/ast/ast.odin       | 12 +++++-
 core/odin/parser/parser.odin | 77 +++++++-----------------------------
 2 files changed, 25 insertions(+), 64 deletions(-)

diff --git a/core/odin/ast/ast.odin b/core/odin/ast/ast.odin
index a4e4a6b35..d1b91a829 100644
--- a/core/odin/ast/ast.odin
+++ b/core/odin/ast/ast.odin
@@ -552,7 +552,10 @@ unparen_expr :: proc(expr: ^Expr) -> (val: ^Expr) {
 	return
 }
 
+Field_Flags :: distinct bit_set[Field_Flag]
+
 Field_Flag :: enum {
+	Invalid,
 	Unknown,
 
 	Ellipsis,
@@ -571,6 +574,7 @@ Field_Flag :: enum {
 }
 
 field_flag_strings := [Field_Flag]string{
+	.Invalid            = "",
 	.Unknown            = "",
 
 	.Ellipsis           = "..",
@@ -588,8 +592,14 @@ field_flag_strings := [Field_Flag]string{
 	.Typeid_Token       = "typeid",
 }
 
+field_hash_flag_strings := []struct{key: string, flag: Field_Flag}{
+	{"no_alias", .No_Alias},
+	{"c_vararg", .C_Vararg},
+	{"any_int",  .Any_Int},
+	{"subtype",  .Subtype},
+	{"by_ptr",   .By_Ptr},
+}
 
-Field_Flags :: distinct bit_set[Field_Flag]
 
 Field_Flags_Struct :: Field_Flags{
 	.Using,
diff --git a/core/odin/parser/parser.odin b/core/odin/parser/parser.odin
index 52f4d1588..320db28c1 100644
--- a/core/odin/parser/parser.odin
+++ b/core/odin/parser/parser.odin
@@ -1611,48 +1611,6 @@ new_ast_field :: proc(names: []^ast.Expr, type: ^ast.Expr, default_value: ^ast.E
 	return field
 }
 
-
-Field_Prefix :: enum {
-	Invalid,
-	Unknown,
-
-	Using,
-	No_Alias,
-	C_Vararg,
-	Auto_Cast,
-	Any_Int,
-	Subtype,
-	By_Ptr,
-}
-
-field_prefix_strings := [Field_Prefix]string{
-	.Invalid   = "invalid",
-	.Unknown   = "unknown",
-
-	.Using     = "using",
-	.Auto_Cast = "auto_cast",
-	.No_Alias  = "#no_alias",
-	.C_Vararg  = "#c_vararg",
-	.Any_Int   = "#any_int",
-	.Subtype   = "#subtype",
-	.By_Ptr    = "#by_ptr",
-}
-
-field_prefix_to_flag := [Field_Prefix]ast.Field_Flag{
-	.Invalid   = .Unknown,
-	.Unknown   = .Unknown,
-
-	.Using     = .Using,
-	.No_Alias  = .No_Alias,
-	.C_Vararg  = .C_Vararg,
-	.Auto_Cast = .Auto_Cast,
-	.Any_Int   = .Any_Int,
-	.Subtype   = .Subtype,
-	.By_Ptr    = .By_Ptr,
-}
-
-Field_Prefixes :: distinct bit_set[Field_Prefix]
-
 Expr_And_Flags :: struct {
 	expr:  ^ast.Expr,
 	flags: ast.Field_Flags,
@@ -1694,7 +1652,7 @@ convert_to_ident_list :: proc(p: ^Parser, list: []Expr_And_Flags, ignore_flags,
 	return idents[:]
 }
 
-is_token_field_prefix :: proc(p: ^Parser) -> Field_Prefix {
+is_token_field_prefix :: proc(p: ^Parser) -> ast.Field_Flag {
 	#partial switch p.curr_tok.kind {
 	case .EOF:
 		return .Invalid
@@ -1709,26 +1667,19 @@ is_token_field_prefix :: proc(p: ^Parser) -> Field_Prefix {
 		defer advance_token(p)
 		#partial switch p.curr_tok.kind {
 		case .Ident:
-			switch p.curr_tok.text {
-			case "no_alias":
-				return .No_Alias
-			case "c_vararg":
-				return .C_Vararg
-			case "any_int":
-				return .Any_Int
-			case "subtype":
-				return .Subtype
-			case "by_ptr":
-				return .By_Ptr
+			for kf in ast.field_hash_flag_strings {
+				if p.curr_tok.text == kf.key {
+					return kf.flag
+				}
 			}
 		}
 		return .Unknown
 	}
-	return .Invalid
+	return .Unknown
 }
 
-parse_field_prefixes :: proc(p: ^Parser) -> ast.Field_Flags {
-	counts: [len(Field_Prefix)]int
+parse_field_prefixes :: proc(p: ^Parser) -> (flags: ast.Field_Flags) {
+	counts: [len(ast.Field_Flag)]int
 
 	for {
 		kind := is_token_field_prefix(p)
@@ -1744,19 +1695,17 @@ parse_field_prefixes :: proc(p: ^Parser) -> ast.Field_Flags {
 		counts[kind] += 1
 	}
 
-	flags: ast.Field_Flags
-
-	for kind in Field_Prefix {
+	for kind in ast.Field_Flag {
 		count := counts[kind]
 		if kind == .Invalid || kind == .Unknown {
 			// Ignore
 		} else {
-			if count > 1 { error(p, p.curr_tok.pos, "multiple '%s' in this field list", field_prefix_strings[kind]) }
-			if count > 0 { flags += {field_prefix_to_flag[kind]} }
+			if count > 1 { error(p, p.curr_tok.pos, "multiple '%s' in this field list", ast.field_flag_strings[kind]) }
+			if count > 0 { flags += {kind} }
 		}
 	}
 
-	return flags
+	return
 }
 
 check_field_flag_prefixes :: proc(p: ^Parser, name_count: int, allowed_flags, set_flags: ast.Field_Flags) -> (flags: ast.Field_Flags) {
@@ -1769,6 +1718,8 @@ check_field_flag_prefixes :: proc(p: ^Parser, name_count: int, allowed_flags, se
 	for flag in ast.Field_Flag {
 		if flag not_in allowed_flags && flag in flags {
 			#partial switch flag {
+			case .Unknown, .Invalid:
+				// ignore
 			case .Tags, .Ellipsis, .Results, .Default_Parameters, .Typeid_Token:
 				panic("Impossible prefixes")
 			case: