feat(bigint): convert Js BigInt to pm.bigint

Xmader · Xmader · commit bccfeff6ccdb · 2023-03-21T13:20:08.000Z
diff --git a/include/modules/pythonmonkey/pythonmonkey.hh b/include/modules/pythonmonkey/pythonmonkey.hh
@@ -19,7 +19,8 @@
 
 #include <Python.h>
 
-#define PythonMonkey_Null PyObject_GetAttrString(PyState_FindModule(&pythonmonkey), "null") /**< macro for python null object*/
+#define PythonMonkey_Null   PyObject_GetAttrString(PyState_FindModule(&pythonmonkey), "null")   /**< macro for pythonmonkey.null object*/
+#define PythonMonkey_BigInt PyObject_GetAttrString(PyState_FindModule(&pythonmonkey), "bigint") /**< macro for pythonmonkey.bigint class object */
 
 static JSContext *cx; /**< pointer to PythonMonkey's JSContext */
 static JS::Rooted<JSObject *> *global; /**< pointer to the global object of PythonMonkey's JSContext */
diff --git a/src/IntType.cc b/src/IntType.cc
@@ -1,3 +1,5 @@
+#include "include/modules/pythonmonkey/pythonmonkey.hh"
+
 #include "include/IntType.hh"
 
 #include "include/PyType.hh"
@@ -51,7 +53,7 @@ IntType::IntType(JSContext *cx, JS::BigInt *bigint) {
     return;
   }
   // If the native endianness is also little-endian,
-  // we now have uniform bytes of 8-bit "digits" in little-endian order
+  // we now have consecutive bytes of 8-bit "digits" in little-endian order
   auto bytes = const_cast<const uint8_t *>((uint8_t *)jsDigits);
   pyObject = _PyLong_FromByteArray(bytes, jsDigitCount * JS_DIGIT_BYTE, true, false);
 
@@ -61,6 +63,10 @@ IntType::IntType(JSContext *cx, JS::BigInt *bigint) {
     auto pyDigitCount = Py_SIZE(pyObject);
     Py_SET_SIZE(pyObject, -pyDigitCount);
   }
+
+  // Cast to a pythonmonkey.bigint to differentiate it from a normal Python int,
+  //  allowing Py<->JS two-way BigInt conversion
+  Py_SET_TYPE(pyObject, (PyTypeObject *)(PythonMonkey_BigInt));
 }
 
 void IntType::print(std::ostream &os) const {
diff --git a/src/jsTypeFactory.cc b/src/jsTypeFactory.cc
@@ -22,11 +22,15 @@ JS::Value jsTypeFactory(PyObject *object) {
     returnType.setBoolean(PyLong_AsLong(object));
   }
   else if (PyLong_Check(object)) {
-    long num = PyLong_AsLong(object); // FIXME: long is 32-bit on Win64 or 32bit *nix  
-    if (JS::Value::isNumberRepresentable(num)) {
-      returnType.setNumber(num);
+    if (PyObject_IsInstance(object, PythonMonkey_BigInt)) { // pm.bigint is a subclass of the builtin int type
+      returnType.setBigInt(num);
     } else {
-      PyErr_SetString(PyExc_TypeError, "Integer exceeds Number.MAX_SAFE_INTEGER. Use pythonmonkey.bigint instead.");
+      long num = PyLong_AsLong(object); // FIXME: long is 32-bit on Win64 or 32bit *nix
+      if (JS::Value::isNumberRepresentable(num)) {
+        returnType.setNumber(num);
+      } else {
+        PyErr_SetString(PyExc_TypeError, "Integer exceeds Number.MAX_SAFE_INTEGER. Use pythonmonkey.bigint instead.");
+      }
     }
   }
   else if (PyFloat_Check(object)) {
