Support more argument types.

Author: PetterS

module.c

@@ -95,11 +95,16 @@ static PyObject *object_call(ObjectData *self, PyObject *args, PyObject *kwds) {
 	const int nargs = PyTuple_Size(args);
 	for (int i = 0; i < nargs; ++i) {
 		PyObject *item = PyTuple_GetItem(args, i);
-		if (PyLong_Check(item)) {
+		if (PyBool_Check(item)) {
+		} else if (PyLong_Check(item)) {
+		} else if (PyFloat_Check(item)) {
 		} else if (PyUnicode_Check(item)) {
 		} else if (PyObject_IsInstance(item, (PyObject *)&Object)) {
 		} else {
-			PyErr_Format(PyExc_ValueError, "Unsupported type when calling quickjs object");
+			PyErr_Format(PyExc_ValueError,
+			             "Unsupported type of argument %d when calling quickjs object: %s.",
+			             i,
+			             Py_TYPE(item)->tp_name);
 			return NULL;
 		}
 	}
@@ -108,8 +113,12 @@ static PyObject *object_call(ObjectData *self, PyObject *args, PyObject *kwds) {
 	JSValueConst *jsargs = malloc(nargs * sizeof(JSValueConst));
 	for (int i = 0; i < nargs; ++i) {
 		PyObject *item = PyTuple_GetItem(args, i);
-		if (PyLong_Check(item)) {
+		if (PyBool_Check(item)) {
+			jsargs[i] = JS_MKVAL(JS_TAG_BOOL, item == Py_True ? 1 : 0);
+		} else if (PyLong_Check(item)) {
 			jsargs[i] = JS_MKVAL(JS_TAG_INT, PyLong_AsLong(item));
+		} else if (PyFloat_Check(item)) {
+			jsargs[i] = JS_NewFloat64(self->context->context, PyFloat_AsDouble(item));
 		} else if (PyUnicode_Check(item)) {
 			jsargs[i] = JS_NewString(self->context->context, PyUnicode_AsUTF8(item));
 		} else if (PyObject_IsInstance(item, (PyObject *)&Object)) {

quickjs/__init__.py

@@ -26,7 +26,7 @@ def __call__(self, *args):
 
     def _call(self, *args):
         def convert_arg(arg):
-            if isinstance(arg, (str, int)):
+            if isinstance(arg, (str, bool, float, int)):
                 return arg
             else:
                 # More complex objects are passed through JSON.

test_quickjs.py

@@ -24,6 +24,7 @@ def test_eval_str(self):
 
     def test_eval_bool(self):
         self.assertEqual(self.context.eval("true || false"), True)
+        self.assertEqual(self.context.eval("true && false"), False)
 
     def test_eval_null(self):
         self.assertIsNone(self.context.eval("null"))
@@ -167,6 +168,26 @@ def test_adder(self):
         self.assertEqual(f(100, 200), 300)
         self.assertEqual(f("a", "b"), "ab")
 
+    def test_identity(self):
+        identity = quickjs.Function(
+            "identity", """
+            function identity(x) {
+                return x;
+            }
+            """)
+        for x in [True, [1], {"a": 2}, 1, 1.5, "hej"]:
+            self.assertEqual(identity(x), x)
+
+    def test_bool(self):
+        f = quickjs.Function(
+            "f", """
+            function f(x) {
+                return [typeof x ,!x];
+            }
+            """)
+        self.assertEqual(f(False), ["boolean", True])
+        self.assertEqual(f(True), ["boolean", False])
+
     def test_empty(self):
         f = quickjs.Function("f", "function f() { }")
         self.assertEqual(f(), None)