Add test for resolving caster in a namespace

Author: virtuald

src/semiwrap/cmd_resolve_casters.py

@@ -24,10 +24,20 @@ def _update_all_casters(type_caster_cfg: pathlib.Path, all_casters: CastersData)
             )
 
         for typ in item.types:
+            td = TypeData(
+                header=header, typename=typ, default_arg_cast=item.default_arg_cast
+            )
+
             if typ not in all_casters:
-                all_casters[typ] = TypeData(
-                    header=header, typename=typ, default_arg_cast=item.default_arg_cast
-                )
+                all_casters[typ] = td
+
+            # in addition to the type, add a non-namespaced version too
+            # - in theory this could cause conflicts, but in practice its useful
+            # - this could be solved by making the parser resolve namespaces, but
+            #   that has downsides too
+            ntyp = typ.split("::")[-1]
+            if ntyp not in all_casters:
+                all_casters[ntyp] = td
 
 
 def main():

tests/cpp/sw-caster-consumer/pyproject.toml

@@ -24,3 +24,6 @@ depends = ["swtest_base__module"]
 
 [tool.semiwrap.extension_modules."sw_caster_consumer._module".headers]
 more = "cpp/more.h"
+
+# checks that caster is included automatically when in a namespace
+ns_more = "cpp/ns_more.h"

tests/cpp/sw-caster-consumer/src/sw_caster_consumer/cpp/ns_more.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <ns_inty.h>
+
+namespace ns {
+
+inline inty2 add_more_to_inty2(inty2 v, long value) {
+    v.long_value += value;
+    return v;
+}
+
+}

tests/cpp/sw-caster-consumer/wrapcfg/ns_more.yml

@@ -0,0 +1,4 @@
+---
+
+functions:
+  add_more_to_inty2:

tests/cpp/sw-test-base/pyproject.toml

@@ -41,3 +41,7 @@ includedir = ["src/swtest_base/cpp/type_casters"]
 [[tool.semiwrap.export_type_casters.sw-test-base-casters.headers]]
 header = "inty_cast.h"
 types = ["inty"]
+
+[[tool.semiwrap.export_type_casters.sw-test-base-casters.headers]]
+header = "ns_inty_cast.h"
+types = ["ns::inty2"]

tests/cpp/sw-test-base/src/swtest_base/cpp/ns_inty.h

@@ -0,0 +1,9 @@
+#pragma once
+
+namespace ns {
+
+struct inty2 { long long_value; };
+
+}
+
+

tests/cpp/sw-test-base/src/swtest_base/cpp/type_casters/ns_inty_cast.h

@@ -0,0 +1,51 @@
+#pragma once
+
+//
+// From pybind11 documentation
+//
+
+#include <pybind11/pybind11.h>
+
+#include "../ns_inty.h"
+
+namespace pybind11 { namespace detail {
+    template <> struct type_caster<ns::inty2> {
+    public:
+        /**
+         * This macro establishes the name 'inty' in
+         * function signatures and declares a local variable
+         * 'value' of type inty
+         */
+        PYBIND11_TYPE_CASTER(ns::inty2, const_name("swtest_base.inty"));
+
+        /**
+         * Conversion part 1 (Python->C++): convert a PyObject into a inty
+         * instance or return false upon failure. The second argument
+         * indicates whether implicit conversions should be applied.
+         */
+        bool load(handle src, bool) {
+            /* Extract PyObject from handle */
+            PyObject *source = src.ptr();
+            /* Try converting into a Python integer value */
+            PyObject *tmp = PyNumber_Long(source);
+            if (!tmp)
+                return false;
+            /* Now try to convert into a C++ int */
+            value.long_value = PyLong_AsLong(tmp);
+            Py_DECREF(tmp);
+            /* Ensure return code was OK (to avoid out-of-range errors etc) */
+            return !(value.long_value == -1 && !PyErr_Occurred());
+        }
+
+        /**
+         * Conversion part 2 (C++ -> Python): convert an inty instance into
+         * a Python object. The second and third arguments are used to
+         * indicate the return value policy and parent object (for
+         * ``return_value_policy::reference_internal``) and are generally
+         * ignored by implicit casters.
+         */
+        static handle cast(ns::inty2 src, return_value_policy /* policy */, handle /* parent */) {
+            return PyLong_FromLong(src.long_value);
+        }
+    };
+}} // namespace PYBIND11_NAMESPACE::detail