From 9dbbd4bc628a17c14f62401222830675a54aa38c Mon Sep 17 00:00:00 2001
From: disarray2077 <86157825+disarray2077@users.noreply.github.com>
Date: Mon, 18 Mar 2024 21:16:07 -0300
Subject: [PATCH] Allow Enum.Parse with numbers again

---
 BeefLibs/corlib/src/Enum.bf | 54 ++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 7 deletions(-)

diff --git a/BeefLibs/corlib/src/Enum.bf b/BeefLibs/corlib/src/Enum.bf
index a2d9fe27..066edecd 100644
--- a/BeefLibs/corlib/src/Enum.bf
+++ b/BeefLibs/corlib/src/Enum.bf
@@ -414,6 +414,43 @@ namespace System
 				}
 			}
 
+			bool canParseNum = typeof(T).FieldCount > 0 && !hadPayload;
+			String ident = canParseNum ? "\t\t" : "\t";
+
+			if (canParseNum)
+			{
+				code.Append("\tif (int64 val = int64.Parse(str))\n\t{\n\t\tswitch ((T)val)\n\t\t{\n");
+				
+				List<int64> cases = scope List<int64>();
+
+				int caseIdx = 0;
+				for (var fieldInfo in typeof(T).GetFields())
+				{
+					if (!fieldInfo.IsEnumCase)
+						continue;
+
+					if (var fieldTypeInst = fieldInfo.FieldType as TypeInstance)
+					{
+						Variant variant = fieldInfo.GetValue(null).Get();
+						int64 value = variant.Get<int64>();
+	
+						if (cases.Contains(value))
+							continue;
+
+						if ((fieldTypeInst.IsTuple) && (fieldTypeInst.FieldCount > 0))
+							Runtime.NotImplemented();
+
+						code.AppendF($"\t\tcase .{fieldInfo.Name}:\n\t\t\treturn .Ok(.{fieldInfo.Name});\n");
+
+						cases.Add(value);
+					}
+	
+					caseIdx++;
+				}
+
+				code.Append("\t\t}\n\t}\n\telse\n\t{\n");
+			}
+
 			int caseIdx = 0;
 			for (var fieldInfo in typeof(T).GetFields())
 			{
@@ -425,23 +462,26 @@ namespace System
 					bool hasPayload = (fieldTypeInst.IsTuple) && (fieldTypeInst.FieldCount > 0);
 					if (!hasPayload)
 					{
-						code.AppendF($"\tif (str.Equals(\"{fieldInfo.Name}\", ignoreCase))\n\t\treturn .Ok(.{fieldInfo.Name});\n");
+						code.AppendF($"{ident}if (str.Equals(\"{fieldInfo.Name}\", ignoreCase))\n{ident}\treturn .Ok(.{fieldInfo.Name});\n");
 					}
 					else	
 					{
-						code.AppendF($"\tif (str.StartsWith(\"{fieldInfo.Name}(\", ignoreCase ? .OrdinalIgnoreCase : .Ordinal))\n\t{{\n");
-						code.AppendF($"\t\t*({dscrType}*)((uint8*)&result + {dscrOffset}) = {fieldInfo.MemberOffset};\n");
-						code.AppendF($"\t\tvar itr = Try!(EnumFields(str.Substring({fieldInfo.Name.Length+1})));\n");
+						code.AppendF($"{ident}if (str.StartsWith(\"{fieldInfo.Name}(\", ignoreCase ? .OrdinalIgnoreCase : .Ordinal))\n{ident}{{\n");
+						code.AppendF($"{ident}\t*({dscrType}*)((uint8*)&result + {dscrOffset}) = {fieldInfo.MemberOffset};\n");
+						code.AppendF($"{ident}\tvar itr = Try!(EnumFields(str.Substring({fieldInfo.Name.Length+1})));\n");
 						for (var tupField in fieldTypeInst.GetFields())
-							code.AppendF($"\t\tTry!(ParseValue(ref itr, ref *({tupField.FieldType}*)((uint8*)&result + {tupField.MemberOffset})));\n");
-						code.Append("\t\treturn result;\n");
-						code.Append("\t}\n");
+							code.AppendF($"{ident}\tTry!(ParseValue(ref itr, ref *({tupField.FieldType}*)((uint8*)&result + {tupField.MemberOffset})));\n");
+						code.AppendF($"{ident}\treturn result;\n");
+						code.AppendF($"{ident}}}\n");
 					}
 				}
 
 				caseIdx++;
 			}
 
+			if (canParseNum)
+				code.Append("\t}\n");
+
 			code.Append("\treturn .Err;\n");
 			code.Append("}\n");