Correcting __int__ node and real and other similar nodes extends this one.

Author: ppisl

graalpython/com.oracle.graal.python.test/src/tests/test_int.py

@@ -101,6 +101,40 @@ def test_int_bit_length():
 class MyInt(int):
     pass
 
+def test_int():
+    def builtinTest(number):
+        a = int(number)
+        b = a.__int__()
+        assert a == b
+        assert a is b
+        assert type(a) == int
+        assert type(b) == int
+
+    builtinTest(-9)
+    builtinTest(0)
+    builtinTest(9)
+    builtinTest(6227020800)
+    builtinTest(9999992432902008176640000999999)
+    
+    assert True.__int__() == 1
+    assert False.__int__() == 0
+
+
+def test_int_subclass():
+    def subclassTest(number):
+        a = MyInt(number)
+        b = a.__int__()
+        assert a == b
+        assert a is not b
+        assert type(a) == MyInt
+        assert type(b) == int
+
+    subclassTest(-9)
+    subclassTest(0)
+    subclassTest(9)
+    subclassTest(6227020800)
+    subclassTest(9999992432902008176640000999999)
+
 def test_real_imag():
     def builtinTest(number):
         a = int(number)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java

@@ -1854,42 +1854,8 @@ int bitLength(PInt argument) {
 
     @GenerateNodeFactory
     @Builtin(name = "real", fixedNumOfArguments = 1, isGetter = true, doc = "the real part of a complex number")
-    static abstract class RealNode extends PythonBuiltinNode {
+    static abstract class RealNode extends IntNode {
 
-        @Child private GetClassNode getClassNode;
-
-        protected PythonClass getClass(Object value) {
-            if (getClassNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                getClassNode = insert(GetClassNode.create());
-            }
-            return getClassNode.execute(value);
-        }
-
-        @Specialization
-        int get(boolean self) {
-            return self ? 1 : 0;
-        }
-
-        @Specialization
-        int get(int self) {
-            return self;
-        }
-
-        @Specialization
-        long get(long self) {
-            return self;
-        }
-
-        @Specialization(guards = "cannotBeOverridden(getClass(self))")
-        PInt getPInt(PInt self) {
-            return self;
-        }
-
-        @Specialization(guards = "!cannotBeOverridden(getClass(self))")
-        PInt getPIntOverriden(PInt self) {
-            return factory().createInt(self.getValue());
-        }
     }
 
     @GenerateNodeFactory
@@ -1903,13 +1869,13 @@ int get(@SuppressWarnings("unused") Object self) {
 
     @GenerateNodeFactory
     @Builtin(name = "numerator", fixedNumOfArguments = 1, isGetter = true, doc = "the numerator of a rational number in lowest terms")
-    static abstract class NumeratorNode extends RealNode {
+    static abstract class NumeratorNode extends IntNode {
 
     }
 
     @GenerateNodeFactory
     @Builtin(name = "conjugate", fixedNumOfArguments = 1, doc = "Returns self, the complex conjugate of any int.")
-    static abstract class ConjugateNode extends RealNode {
+    static abstract class ConjugateNode extends IntNode {
 
     }
 
@@ -1925,6 +1891,21 @@ int get(@SuppressWarnings("unused") Object self) {
     @Builtin(name = SpecialMethodNames.__INT__, fixedNumOfArguments = 1)
     @GenerateNodeFactory
     abstract static class IntNode extends PythonBuiltinNode {
+        @Child private GetClassNode getClassNode;
+
+        protected PythonClass getClass(Object value) {
+            if (getClassNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                getClassNode = insert(GetClassNode.create());
+            }
+            return getClassNode.execute(value);
+        }
+
+        @Specialization
+        int doB(boolean self) {
+            return self ? 1 : 0;
+        }
+
         @Specialization
         int doI(int self) {
             return self;
@@ -1935,8 +1916,13 @@ long doL(long self) {
             return self;
         }
 
-        @Specialization
-        PInt doPi(PInt self) {
+        @Specialization(guards = "cannotBeOverridden(getClass(self))")
+        PInt doPInt(PInt self) {
+            return self;
+        }
+
+        @Specialization(guards = "!cannotBeOverridden(getClass(self))")
+        PInt doPIntOverriden(PInt self) {
             return factory().createInt(self.getValue());
         }
     }