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

Merge pull request #1319 from disarray2077/patch-2

Browse source 
Fix some Enum methods
This commit is contained in:
Brian Fiete 2021-12-29 17:10:53 +01:00 • committed by GitHub
commit 48640bcf77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,8 @@ namespace System
{
for (var field in type.GetFields())
{
if (field.[Friend]mFieldData.[Friend]mData == iVal)
if (field.[Friend]mFieldData.mFlags.HasFlag(.EnumCase) &&
field.[Friend]mFieldData.[Friend]mData == iVal)
{
strBuffer.Append(field.Name);
return;
@ -21,11 +22,10 @@ namespace System
public static Result<T> Parse<T>(StringView str, bool ignoreCase = false) where T : enum
{
var typeInst = (TypeInstance)typeof(T);
for (var field in typeInst.GetFields())
for (var (name, data) in GetEnumerator<T>())
{
if (str.Equals(field.[Friend]mFieldData.mName, ignoreCase))
return .Ok(*((T*)(&field.[Friend]mFieldData.mData)));
if (str.Equals(name, ignoreCase))
return .Ok(data);
}
return .Err;
@ -34,10 +34,9 @@ namespace System
public static bool IsDefined<T>(T value)
where T : enum
{
var typeInst = (TypeInstance)typeof(T);
for (var field in typeInst.GetFields())
for (var data in GetValues<T>())
{
if (field.[Friend]mFieldData.[Friend]mData == (.)value)
if (data == (.)value)
return true;
}