Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 11:38:21 +02:00
Code Activity

Allow Enum.Parse with numbers again

Browse source
This commit is contained in:
disarray2077 2024-03-18 21:16:07 -03:00
parent 084566cdc6
commit 9dbbd4bc62
1 changed files with 47 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

54
BeefLibs/corlib/src/Enum.bf
View file

@ -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");