Implement __int__ across all integer types (#1382)

Author: BCSharp

Src/IronPython/Runtime/Operations/IntOps.Generated.cs

@@ -93,6 +93,8 @@ public static object Abs(SByte x) {
 
         public static SByte __trunc__(SByte x) => x;
 
+        public static int __int__(SByte x) => unchecked((int)x);
+
         public static int __index__(SByte x) => unchecked((int)x);
 
         public static int __hash__(SByte x) {
@@ -353,6 +355,8 @@ public static object __new__(PythonType cls, object value) {
 
         public static Byte __trunc__(Byte x) => x;
 
+        public static int __int__(Byte x) => unchecked((int)x);
+
         public static int __index__(Byte x) => unchecked((int)x);
 
         public static int __hash__(Byte x) {
@@ -715,6 +719,8 @@ public static object Abs(Int16 x) {
 
         public static Int16 __trunc__(Int16 x) => x;
 
+        public static int __int__(Int16 x) => unchecked((int)x);
+
         public static int __index__(Int16 x) => unchecked((int)x);
 
         public static int __hash__(Int16 x) {
@@ -980,6 +986,8 @@ public static object __new__(PythonType cls, object value) {
 
         public static UInt16 __trunc__(UInt16 x) => x;
 
+        public static int __int__(UInt16 x) => unchecked((int)x);
+
         public static int __index__(UInt16 x) => unchecked((int)x);
 
         public static int __hash__(UInt16 x) {
@@ -1352,6 +1360,8 @@ public static object Abs(Int32 x) {
 
         public static Int32 __trunc__(Int32 x) => x;
 
+        public static int __int__(Int32 x) => unchecked((int)x);
+
         public static int __index__(Int32 x) => unchecked((int)x);
 
         public static int __hash__(Int32 x) {
@@ -1592,6 +1602,8 @@ public static object __new__(PythonType cls, object value) {
 
         public static UInt32 __trunc__(UInt32 x) => x;
 
+        public static BigInteger __int__(UInt32 x) => unchecked((BigInteger)x);
+
         public static BigInteger __index__(UInt32 x) => unchecked((BigInteger)x);
 
         public static int __hash__(UInt32 x) {
@@ -1964,6 +1976,8 @@ public static object Abs(Int64 x) {
 
         public static Int64 __trunc__(Int64 x) => x;
 
+        public static BigInteger __int__(Int64 x) => unchecked((BigInteger)x);
+
         public static BigInteger __index__(Int64 x) => unchecked((BigInteger)x);
 
         public static int __hash__(Int64 x) {
@@ -2232,6 +2246,8 @@ public static object __new__(PythonType cls, object value) {
 
         public static UInt64 __trunc__(UInt64 x) => x;
 
+        public static BigInteger __int__(UInt64 x) => unchecked((BigInteger)x);
+
         public static BigInteger __index__(UInt64 x) => unchecked((BigInteger)x);
 
         public static int __hash__(UInt64 x) {

Src/IronPython/Runtime/Operations/IntOps.cs

@@ -154,10 +154,6 @@ public static object __rdivmod__(int x, int y) {
             return __divmod__(y, x);
         }
 
-        public static int __int__(int self) {
-            return self;
-        }
-
         public static double __float__(int self) {
             return (double)self;
         }

Src/Scripts/generate_alltypes.py

@@ -104,6 +104,9 @@ def is_implicit(self, oty):
 simple_identity_method = """
 public static %(type)s %(method_name)s(%(type)s x) => x;"""
 
+unchecked_cast_method = """
+public static %(cast_type)s %(method_name)s(%(type)s x) => unchecked((%(cast_type)s)x);"""
+
 identity_method = """
 [SpecialName]
 public static %(type)s %(method_name)s(%(type)s x) => x;"""
@@ -175,11 +178,12 @@ def gen_unaryops(cw, ty):
     else:
         cw.write(simple_identity_method, type=ty.name, method_name="__trunc__")
 
-        cw.writeline()
         if ty.max > Int32.MaxValue:
-            cw.write('public static BigInteger __index__(%s x) => unchecked((BigInteger)x);' % (ty.name))
+            cw.write(unchecked_cast_method, type=ty.name, method_name="__int__", cast_type="BigInteger")
+            cw.write(unchecked_cast_method, type=ty.name, method_name="__index__", cast_type="BigInteger")
         else:
-            cw.write('public static int __index__(%s x) => unchecked((int)x);' % (ty.name))
+            cw.write(unchecked_cast_method, type=ty.name, method_name="__int__", cast_type="int")
+            cw.write(unchecked_cast_method, type=ty.name, method_name="__index__", cast_type="int")
 
         cw.writeline()
         cw.enter_block('public static int __hash__(%s x)' % (ty.name))