chore(merge): resolve merge conflicts

Co-authored-by: Philippe Laport <[email protected]>

Author: zollqir

include/JSObjectProxy.hh

@@ -129,6 +129,25 @@ public:
    * @return the string representation (a PyUnicodeObject) on success, NULL on failure
    */
   static PyObject *JSObjectProxy_repr(JSObjectProxy *self);
+
+  /**
+   * @brief Set union method
+   *
+   * @param self - The JSObjectProxy
+   * @param other - The other PyObject to be or'd, expected to be dict or JSObjectProxy
+   * @return PyObject* The resulting new dict
+   */
+  static PyObject *JSObjectProxy_or(JSObjectProxy *self, PyObject *other);
+
+  /**
+   * @brief Set union method, in place
+   *
+   * @param self - The JSObjectProxy
+   * @param other - The other PyObject to be or'd, expected to be dict or JSObjectProxy
+   * @return PyObject* The resulting new dict, must be same object as self
+   */
+  static PyObject *JSObjectProxy_ior(JSObjectProxy *self, PyObject *other);
+
 };
 
 
@@ -146,6 +165,11 @@ static PySequenceMethods JSObjectProxy_sequence_methods = {
   .sq_contains = (objobjproc)JSObjectProxyMethodDefinitions::JSObjectProxy_contains
 };
 
+static PyNumberMethods JSObjectProxy_number_methods = {
+  .nb_or = (binaryfunc)JSObjectProxyMethodDefinitions::JSObjectProxy_or,
+  .nb_inplace_or = (binaryfunc)JSObjectProxyMethodDefinitions::JSObjectProxy_ior
+};
+
 /**
  * @brief Struct for the JSObjectProxyType, used by all JSObjectProxy objects
  */

src/JSObjectProxy.cc

@@ -21,6 +21,8 @@
 
 #include <Python.h>
 
+#include <object.h>
+
 JSContext *GLOBAL_CX; /**< pointer to PythonMonkey's JSContext */
 
 bool keyToId(PyObject *key, JS::MutableHandleId idp) {

src/modules/pythonmonkey/pythonmonkey.cc

@@ -74,6 +74,7 @@ PyTypeObject JSObjectProxyType = {
   .tp_basicsize = sizeof(JSObjectProxy),
   .tp_dealloc = (destructor)JSObjectProxyMethodDefinitions::JSObjectProxy_dealloc,
   .tp_repr = (reprfunc)JSObjectProxyMethodDefinitions::JSObjectProxy_repr,
+  .tp_as_number = &JSObjectProxy_number_methods,
   .tp_as_sequence = &JSObjectProxy_sequence_methods,
   .tp_as_mapping = &JSObjectProxy_mapping_methods,
   .tp_getattro = (getattrofunc)JSObjectProxyMethodDefinitions::JSObjectProxy_get,