Use py::self {operator} py::self shortcut for operators

robotpy_build/autowrap/cxxparser.py

@@ -1043,6 +1043,23 @@ def _on_class_method(
             self.hctx.need_operators_h = True
             if method_data.no_release_gil is None:
                 fctx.release_gil = False
+
+            # Use cpp_code to setup the operator
+            if fctx.cpp_code is None:
+                if len(method.parameters) == 0:
+                    fctx.cpp_code = f"{operator} py::self"
+                else:
+                    ptype, _, _, _ = _count_and_unwrap(method.parameters[0].type)
+                    if (
+                        isinstance(ptype, Type)
+                        and isinstance(ptype.typename.segments[-1], NameSpecifier)
+                        and ptype.typename.segments[-1].name == cdata.ctx.cpp_name
+                    ):
+                        # don't try to predict the type, use py::self instead
+                        fctx.cpp_code = f"py::self {operator} py::self"
+                    else:
+                        fctx.cpp_code = f"py::self {operator} {fctx.all_params[0].cpp_type_no_const}()"
+
         if method.const:
             fctx.const = True
         if method.static:

robotpy_build/autowrap/j2_context.py

@@ -250,6 +250,7 @@ class FunctionContext:
     namespace: str = ""
 
     #: The operator for this method
+    #: - if set, cpp_type will be filled out by the parser
     operator: typing.Optional[str] = None
 
     #: True if this is a static method

robotpy_build/autowrap/pybind11.cpp.j2

@@ -82,15 +82,7 @@
   #ifndef {{ fn.ifndef }}
   {% endif %}
   {%- if fn.operator -%}
-    {%- if fn.cpp_code -%}
         .def({{ fn.cpp_code }}
-    {%- else -%}
-      {%- if ns.arg_params -%}
-        .def(py::self {{ fn.operator }} {{ ns.arg_params[0].cpp_type_no_const }}()
-      {%- else -%}
-        .def({{ fn.operator}} py::self
-      {%- endif -%}
-    {%- endif -%}
     {%- set ns.arg_params = [] -%}
   {%- elif fn.is_constructor -%}
     {%- if fn.cpp_code -%}

tests/cpp/rpytest/ft/__init__.py

@@ -22,6 +22,7 @@
     GEnumMath,
     HasFactory,
     HasOperator,
+    HasOperatorNoDefault,
     IBase,
     IChild,
     IFinal,
@@ -136,6 +137,7 @@
     "GEnumMath",
     "HasFactory",
     "HasOperator",
+    "HasOperatorNoDefault",
     "IBase",
     "IChild",
     "IFinal",

tests/cpp/rpytest/ft/include/operators.h

@@ -12,3 +12,16 @@ class HasOperator {
 private:
     int m_i;
 };
+
+struct HasOperatorNoDefault {
+    // no default constructor
+    explicit HasOperatorNoDefault(int set_x) {
+        x = set_x;
+    }
+
+    bool operator==(const HasOperatorNoDefault &o) const {
+        return x == o.x;
+    }
+
+    int x;
+};

tests/test_ft_misc.py

@@ -161,6 +161,16 @@ def test_operators_eq():
     assert o1 != o2
 
 
+def test_operators_eq2():
+    o1 = ft.HasOperatorNoDefault(1)
+    o1a = ft.HasOperatorNoDefault(1)
+    o2 = ft.HasOperatorNoDefault(2)
+
+    assert o1 == o1a
+    assert not (o1 == o2)
+    assert o1 != o2
+
+
 #
 # static_only.h
 #