Properly wrap and convert 'True' and 'False'.

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -47,14 +47,19 @@ static void initialize_type_structure(PyTypeObject* structure, const char* typna
 }
 
 static void initialize_globals() {
+    // None
     void *jnone = polyglot_as__object(to_sulong(polyglot_invoke(PY_TRUFFLE_CEXT, "Py_None")));
     truffle_assign_managed(&_Py_NoneStruct, jnone);
+
+    // NotImplemented
     void *jnotimpl = polyglot_as__object(polyglot_get_member(PY_BUILTIN, "NotImplemented"));
     truffle_assign_managed(&_Py_NotImplementedStruct, jnotimpl);
+
+    // True, False
     void *jtrue = polyglot_invoke(PY_TRUFFLE_CEXT, "Py_True");
-    truffle_assign_managed(&_Py_TrueStruct, to_sulong(jtrue));
+    truffle_assign_managed(&_Py_TrueStruct, polyglot_as__longobject(to_sulong(jtrue)));
     void *jfalse = polyglot_invoke(PY_TRUFFLE_CEXT, "Py_False");
-    truffle_assign_managed(&_Py_FalseStruct, to_sulong(jfalse));
+    truffle_assign_managed(&_Py_FalseStruct, polyglot_as__longobject(to_sulong(jfalse)));
 }
 
 __attribute__((constructor))

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -63,6 +63,7 @@ POLYGLOT_DECLARE_TYPE(PyListObject);
 POLYGLOT_DECLARE_TYPE(PyDictObject);
 POLYGLOT_DECLARE_TYPE(PyUnicodeObject);
 POLYGLOT_DECLARE_TYPE(PyBytesObject);
+POLYGLOT_DECLARE_STRUCT(_longobject);
 
 
 extern void* to_java(PyObject* obj);

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_bool.py

@@ -0,0 +1,81 @@
+# Copyright (c) 2018, Oracle and/or its affiliates.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or data
+# (collectively the "Software"), free of charge and under any and all copyright
+# rights in the Software, and any and all patent rights owned or freely
+# licensable by each licensor hereunder covering either (i) the unmodified
+# Software as contributed to or provided by such licensor, or (ii) the Larger
+# Works (as defined below), to deal in both
+#
+# (a) the Software, and
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+#     one is included with the Software (each a "Larger Work" to which the
+#     Software is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import sys
+from . import CPyExtTestCase, CPyExtFunction, CPyExtFunctionOutVars, unhandled_error_compare, GRAALPYTHON
+__dir__ = __file__.rpartition("/")[0]
+
+
+class DummyNonInt():
+    pass
+
+
+class DummyIntable():
+    def __int__(self):
+        return 0xCAFE
+
+
+class DummyIntSubclass(float):
+    def __int__(self):
+        return 0xBABE
+
+
+class TestPyBool(CPyExtTestCase):
+    def compile_module(self, name):
+        type(self).mro()[1].__dict__["test_%s" % name].create_module(name)
+        super(TestPyBool, self).compile_module(name)
+
+    test_PyBool_Check = CPyExtFunction(
+        lambda args: isinstance(args[0], bool),
+        lambda: (
+            (0,), 
+            (1,), 
+            (True,), 
+            (False,), 
+            (-1,), 
+            (0xffffffff,),
+            (0xfffffffffffffffffffffff,),
+            ("hello",),
+            (DummyNonInt(),),
+            (DummyIntable(),),
+            (DummyIntSubclass(),),
+        ),
+        resultspec="i",
+        argspec='O',
+        arguments=["PyObject* o"],
+        cmpfunc=unhandled_error_compare
+    )

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bool/BoolBuiltins.java

@@ -43,6 +43,7 @@
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
+import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
@@ -134,11 +135,16 @@ Object doGeneric(Object left, Object right) {
 
     @Builtin(name = __INT__, fixedNumOfArguments = 1)
     @GenerateNodeFactory
-    abstract static class IntNode extends PythonBinaryBuiltinNode {
+    abstract static class IntNode extends PythonUnaryBuiltinNode {
         @Specialization
         int op(boolean self) {
             return self ? 1 : 0;
         }
+
+        @Fallback
+        Object doGeneric(@SuppressWarnings("unused") Object self) {
+            return PNotImplemented.NOT_IMPLEMENTED;
+        }
     }
 
     @Builtin(name = __INDEX__, fixedNumOfArguments = 1)
@@ -148,10 +154,15 @@ abstract static class IndexNode extends IntNode {
 
     @Builtin(name = __FLOAT__, fixedNumOfArguments = 1)
     @GenerateNodeFactory
-    abstract static class FloatNode extends PythonBinaryBuiltinNode {
+    abstract static class FloatNode extends PythonUnaryBuiltinNode {
         @Specialization
         double op(boolean self) {
             return self ? 1.0 : 0.0;
         }
+
+        @Fallback
+        Object doGeneric(@SuppressWarnings("unused") Object self) {
+            return PNotImplemented.NOT_IMPLEMENTED;
+        }
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -203,7 +203,7 @@ public PythonNativeObject createNativeObjectWrapper(Object obj) {
      */
 
     public PInt createInt(boolean value) {
-        return trace(new PInt(lookupClass(PythonBuiltinClassType.PInt), value ? BigInteger.ONE : BigInteger.ZERO));
+        return trace(new PInt(lookupClass(PythonBuiltinClassType.Boolean), value ? BigInteger.ONE : BigInteger.ZERO));
     }
 
     public PInt createInt(int value) {