Add test_named_namespace_a, test_named_namespace_b

Author: rwgk

include/pybind11/detail/internals.h

@@ -210,7 +210,10 @@ struct internals {
     }
 #endif
 
-    std::unordered_map<std::type_index, std::vector<std::string>> std_type_index_registry;
+    std::unordered_map<std::type_index, std::vector<std::string>>
+        std_type_index_registry_unnamed_namespace;
+    std::unordered_map<std::type_index, std::vector<std::string>>
+        std_type_index_registry_named_namespace;
 };
 
 /// Additional type information which does not fit into the PyTypeObject.

tests/CMakeLists.txt

@@ -142,6 +142,8 @@ set(PYBIND11_TEST_FILES
     test_methods_and_attributes
     test_modules
     test_multiple_inheritance
+    test_named_namespace_a.py
+    test_named_namespace_b.py
     test_numpy_array
     test_numpy_dtypes
     test_numpy_vectorize
@@ -221,6 +223,8 @@ tests_extra_targets("test_exceptions.py;test_local_bindings.py;test_stl.py;test_
 # And add additional targets for other tests.
 tests_extra_targets("test_exceptions.py" "cross_module_interleaved_error_already_set")
 tests_extra_targets("test_gil_scoped.py" "cross_module_gil_utils")
+tests_extra_targets("test_named_namespace_a.py" "named_namespace_a")
+tests_extra_targets("test_named_namespace_b.py" "named_namespace_b")
 
 set(PYBIND11_EIGEN_REPO
     "https://gitlab.com/libeigen/eigen.git"

tests/named_namespace_a.cpp

@@ -0,0 +1,25 @@
+#include <pybind11/stl.h>
+
+#include "pybind11_tests.h"
+
+namespace test_named_namespace {
+struct any_struct {};
+} // namespace test_named_namespace
+
+PYBIND11_MODULE(named_namespace_a, m) {
+    m.attr("name") = "NA";
+
+    py::detail::get_internals()
+        .std_type_index_registry_named_namespace[std::type_index(
+            typeid(test_named_namespace::any_struct))]
+        .push_back("NA");
+
+    m.def("std_type_index_registry_dump", []() {
+        py::list items;
+        for (const auto &it :
+             py::detail::get_internals().std_type_index_registry_named_namespace) {
+            items.append(py::make_tuple(it.first.name(), it.second));
+        }
+        return items;
+    });
+}

tests/named_namespace_b.cpp

@@ -0,0 +1,14 @@
+#include "pybind11_tests.h"
+
+namespace test_named_namespace {
+struct any_struct {};
+} // namespace test_named_namespace
+
+PYBIND11_MODULE(named_namespace_b, m) {
+    m.attr("name") = "NB";
+
+    py::detail::get_internals()
+        .std_type_index_registry_named_namespace[std::type_index(
+            typeid(test_named_namespace::any_struct))]
+        .push_back("NB");
+}

tests/test_named_namespace_a.py

@@ -0,0 +1,15 @@
+import named_namespace_a as m
+import pytest
+
+
+def test_inspect():
+    assert m.name == "NA"
+    reg = m.std_type_index_registry_dump()
+    if len(reg) == 1:
+        assert tuple(sorted(reg[0][1])) == ("NA", "NB")
+        pytest.skip("std::type_index-EQ-GOOD")
+    if len(reg) == 2:
+        assert reg[0][0] == reg[1][0]
+        assert tuple(sorted(reg[0][1] + reg[1][1])) == ("NA", "NB")
+        pytest.skip("std::type_index-NE-BAD")
+    assert reg is None  # Sure to fail.

tests/test_named_namespace_b.py

@@ -0,0 +1,5 @@
+import named_namespace_b as m
+
+
+def test_inspect():
+    assert m.name == "NB"

tests/test_unnamed_namespace_a.cpp

@@ -7,15 +7,16 @@ struct any_struct {};
 } // namespace
 
 TEST_SUBMODULE(unnamed_namespace_a, m) {
-    m.attr("name") = "A";
+    m.attr("name") = "UA";
 
     py::detail::get_internals()
-        .std_type_index_registry[std::type_index(typeid(any_struct))]
-        .push_back("A");
+        .std_type_index_registry_unnamed_namespace[std::type_index(typeid(any_struct))]
+        .push_back("UA");
 
     m.def("std_type_index_registry_dump", []() {
         py::list items;
-        for (const auto &it : py::detail::get_internals().std_type_index_registry) {
+        for (const auto &it :
+             py::detail::get_internals().std_type_index_registry_unnamed_namespace) {
             items.append(py::make_tuple(it.first.name(), it.second));
         }
         return items;

tests/test_unnamed_namespace_a.py

@@ -4,12 +4,12 @@
 
 
 def test_inspect():
-    assert m.name == "A"
+    assert m.name == "UA"
     reg = m.std_type_index_registry_dump()
     if len(reg) == 1:
-        assert tuple(sorted(reg[0][1])) == ("A", "B")
+        assert tuple(sorted(reg[0][1])) == ("UA", "UB")
         pytest.skip("std::type_index-EQ-BAD")
     if len(reg) == 2:
-        assert tuple(sorted([reg[0][1][0], reg[1][1][0]])) == ("A", "B")
+        assert tuple(sorted([reg[0][1][0], reg[1][1][0]])) == ("UA", "UB")
         pytest.skip("std::type_index-NE-GOOD")
     assert reg is None  # Sure to fail.

tests/test_unnamed_namespace_b.cpp

@@ -5,9 +5,9 @@ struct any_struct {};
 } // namespace
 
 TEST_SUBMODULE(unnamed_namespace_b, m) {
-    m.attr("name") = "B";
+    m.attr("name") = "UB";
 
     py::detail::get_internals()
-        .std_type_index_registry[std::type_index(typeid(any_struct))]
-        .push_back("B");
+        .std_type_index_registry_unnamed_namespace[std::type_index(typeid(any_struct))]
+        .push_back("UB");
 }

tests/test_unnamed_namespace_b.py

@@ -2,4 +2,4 @@
 
 
 def test_inspect():
-    assert m.name == "B"
+    assert m.name == "UB"