Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Provide __int__ instance method on enum types to support int(Enum.Member) #1654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Provide __int__ instance method on enum types to support int(Enum.Member) #1654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/runtime/classmanager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,15 +345,26 @@ private static ClassInfo GetClassInfo(Type type)
}
}

// only [Flags] enums support bitwise operations
if (type.IsEnum && type.IsFlagsEnum())

if (type.IsEnum)
{
var opsImpl = typeof(EnumOps<>).MakeGenericType(type);
foreach (var op in opsImpl.GetMethods(OpsHelper.BindingFlags))
{
local.Add(op.Name);
}
info = info.Concat(opsImpl.GetMethods(OpsHelper.BindingFlags)).ToArray();

// only [Flags] enums support bitwise operations
if (type.IsFlagsEnum())
{
opsImpl = typeof(FlagEnumOps<>).MakeGenericType(type);
foreach (var op in opsImpl.GetMethods(OpsHelper.BindingFlags))
{
local.Add(op.Name);
}
info = info.Concat(opsImpl.GetMethods(OpsHelper.BindingFlags)).ToArray();
}
}

// Now again to filter w/o losing overloaded member info
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/operatormethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public static void FixupSlots(BorrowedReference pyType, Type clrType)
Debug.Assert(_opType != null);

var staticMethods =
clrType.IsEnum ? typeof(EnumOps<>).MakeGenericType(clrType).GetMethods(flags)
clrType.IsEnum ? typeof(FlagEnumOps<>).MakeGenericType(clrType).GetMethods(flags)
: clrType.GetMethods(flags);

foreach (var method in staticMethods)
Expand Down
14 changes: 13 additions & 1 deletion src/runtime/opshelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static Expression EnumUnderlyingValue(Expression enumValue)
internal class OpsAttribute: Attribute { }

[Ops]
internal static class EnumOps<T> where T : Enum
internal static class FlagEnumOps<T> where T : Enum
{
static readonly Func<T, T, T> and = BinaryOp(Expression.And);
static readonly Func<T, T, T> or = BinaryOp(Expression.Or);
Expand Down Expand Up @@ -74,4 +74,16 @@ static Func<T, T> UnaryOp(Func<Expression, UnaryExpression> op)
});
}
}

[Ops]
internal static class EnumOps<T> where T : Enum
{
[ForbidPythonThreads]
#pragma warning disable IDE1006 // Naming Styles - must match Python
public static PyInt __int__(T value)
#pragma warning restore IDE1006 // Naming Styles
=> typeof(T).GetEnumUnderlyingType() == typeof(UInt64)
? new PyInt(Convert.ToUInt64(value))
: new PyInt(Convert.ToInt64(value));
}
}
7 changes: 5 additions & 2 deletions src/testing/enumtest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ public enum LongEnum : long
Two,
Three,
Four,
Five
Five,
Max = long.MaxValue,
Min = long.MinValue,
}

public enum ULongEnum : ulong
Expand All @@ -82,7 +84,8 @@ public enum ULongEnum : ulong
Two,
Three,
Four,
Five
Five,
Max = ulong.MaxValue,
}

[Flags]
Expand Down
9 changes: 9 additions & 0 deletions tests/test_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,15 @@ def test_ulong_enum():
assert Test.ULongEnum.Two == Test.ULongEnum(2)


def test_long_enum_to_int():
assert int(Test.LongEnum.Max) == 9223372036854775807
assert int(Test.LongEnum.Min) == -9223372036854775808


def test_ulong_enum_to_int():
assert int(Test.ULongEnum.Max) == 18446744073709551615


def test_instantiate_enum_fails():
"""Test that instantiation of an enum class fails."""
from System import DayOfWeek
Expand Down