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

Skip to content

use enum name in repr #2239

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

Merged
lostmsu merged 8 commits into from
Sep 22, 2023
Merged

use enum name in repr #2239

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d9c326c
use enum name in repr
Sep 18, 2023
3acd1ca
update test
Sep 18, 2023
be2ae67
changelog
Sep 18, 2023
dea66fb
Use python convention
Sep 19, 2023
a3be481
fix test
Sep 19, 2023
5133cef
respect base enum type
Sep 21, 2023
6e70b0e
fix other assert
Sep 21, 2023
2274595
refactor
Sep 22, 2023
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
Prev Previous commit
Next Next commit
respect base enum type
  • Loading branch information
Mohamed Koubaa committed Sep 21, 2023
commit 5133cefa521553c670232d9a6bf803d6fc0dd531
45 changes: 42 additions & 3 deletions src/runtime/Types/ClassObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,50 @@ private static string getEnumReprString(object inst)
{
var obType = inst.GetType();

var integralType = obType.GetEnumUnderlyingType();
var isFlags = obType.IsFlagsEnum();
var intValue = Convert.ToInt32(inst);
var intStr = isFlags ? "0x" + intValue.ToString("X4") : intValue.ToString();

var repr = $"<{obType.Name}.{inst}: {intStr}>";
string strValue = "";
switch (Type.GetTypeCode(integralType))
{
case TypeCode.SByte:
var valueSB = Convert.ToSByte(inst);
strValue = isFlags ? "0x" + valueSB.ToString("X2") : valueSB.ToString();
break;
case TypeCode.Byte:
var valueB = Convert.ToByte(inst);
strValue = isFlags ? "0x" + valueB.ToString("X2") : valueB.ToString();
break;
case TypeCode.Int16:
var valueI16 = Convert.ToInt16(inst);
strValue = isFlags ? "0x" + valueI16.ToString("X4") : valueI16.ToString();
break;
case TypeCode.UInt16:
var valueUI16 = Convert.ToUInt16(inst);
strValue = isFlags ? "0x" + valueUI16.ToString("X4") : valueUI16.ToString();
break;
case TypeCode.Int32:
var valueI32 = Convert.ToInt32(inst);
strValue = isFlags ? "0x" + valueI32.ToString("X8") : valueI32.ToString();
break;
case TypeCode.UInt32:
var valueUI32 = Convert.ToUInt32(inst);
strValue = isFlags ? "0x" + valueUI32.ToString("X8") : valueUI32.ToString();
break;
case TypeCode.Int64:
var valueI64 = Convert.ToInt64(inst);
strValue = isFlags ? "0x" + valueI64.ToString("X16") : valueI64.ToString();
break;
case TypeCode.UInt64:
var valueUI64 = Convert.ToUInt64(inst);
strValue = isFlags ? "0x" + valueUI64.ToString("X16") : valueUI64.ToString();
break;
default:
break;
}


var repr = $"<{obType.Name}.{inst}: {strValue}>";
return repr;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/test_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def test_enum_repr():
assert repr(DayOfWeek.Monday) == "<DayOfWeek.Monday: 1>"

assert repr(Test.FlagsEnum(7)) == "<FlagsEnum.Two, Five: 0x0007>"
assert repr(Test.FlagsEnum(8)) == "<FlagsEnum.8: 0x0008>"
assert repr(Test.FlagsEnum(8)) == "<FlagsEnum.8: 0x00000008>"


def test_enum_conversion():
Expand Down