Support classes with explicit namespace, ignore specialized classes

Author: virtuald

robotpy_build/autowrap/cxxparser.py

@@ -580,7 +580,11 @@ def on_class_start(self, state: AWClassBlockState) -> typing.Optional[bool]:
         ):
             return False
 
-        cls_key, cls_name, cls_namespace, parent_ctx = self._process_class_name(state)
+        cls_name_result = self._process_class_name(state)
+        if cls_name_result is None:
+            return False
+
+        cls_key, cls_name, cls_namespace, parent_ctx = cls_name_result
         class_data = self.gendata.get_class_data(cls_key)
 
         # Ignore explicitly ignored classes
@@ -761,23 +765,24 @@ def on_class_start(self, state: AWClassBlockState) -> typing.Optional[bool]:
 
     def _process_class_name(
         self, state: AWClassBlockState
-    ) -> typing.Tuple[str, str, str, typing.Optional[ClassContext]]:
+    ) -> typing.Optional[typing.Tuple[str, str, str, typing.Optional[ClassContext]]]:
         class_decl = state.class_decl
         segments = class_decl.typename.segments
         assert len(segments) > 0
 
-        name_segment = segments[-1]
-        if not isinstance(name_segment, NameSpecifier):
-            raise ValueError(f"not sure how to handle '{class_decl.typename}'")
-
-        cls_name = name_segment.name
+        segment_names: typing.List[str] = []
+        for segment in segments:
+            if not isinstance(segment, NameSpecifier):
+                raise ValueError(
+                    f"not sure how to handle '{class_decl.typename.format()}'"
+                )
+            # ignore specializations for now
+            if segment.specialization is not None:
+                return None
+            segment_names.append(segment.name)
 
-        # for now, don't support these?
-        other_segments = segments[:-1]
-        if other_segments:
-            raise ValueError(
-                f"not sure what to do with compound name '{class_decl.typename}'"
-            )
+        cls_name = segment_names[-1]
+        extra_segments = "::".join(segment_names[:-1])
 
         parent_ctx: typing.Optional[ClassContext] = None
 
@@ -787,13 +792,18 @@ def _process_class_name(
             # easy case -- namespace is the next user_data up
             cls_key = cls_name
             cls_namespace = typing.cast(str, parent.user_data)
+            if extra_segments:
+                cls_namespace = f"{cls_namespace}::{extra_segments}"
         else:
             # Use things the parent already computed
             cdata = typing.cast(ClassStateData, parent.user_data)
             # parent: AWClassBlockState = state.parent
             parent_ctx = cdata.ctx
             # the parent context already computed namespace, so use that
-            cls_key = f"{cdata.cls_key}::{cls_name}"
+            if extra_segments:
+                cls_key = f"{cdata.cls_key}::{extra_segments}::{cls_name}"
+            else:
+                cls_key = f"{cdata.cls_key}::{cls_name}"
             cls_namespace = parent_ctx.namespace
 
         return cls_key, cls_name, cls_namespace, parent_ctx

tests/cpp/pyproject.toml.tmpl

@@ -59,6 +59,7 @@ generate = [
     { inline_code = "inline_code.h" },
     { lifetime = "lifetime.h" },
     { nested = "nested.h" },
+    { ns_class = "ns_class.h" },
     { operators = "operators.h" },
     { overloads = "overloads.h" },
     { parameters = "parameters.h" },

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

@@ -0,0 +1,8 @@
+
+namespace ns {
+    struct NSClass;
+}
+
+struct ns::NSClass {
+    int getN() const { return 4; }
+};

tests/cpp/rpytest/ft/include/templates/basic.h

@@ -1,6 +1,7 @@
 
 #pragma once
 
+// basic template
 template <typename T>
 struct TBasic
 {
@@ -10,4 +11,11 @@ struct TBasic
     virtual void setT(const T &t) { this->t = t; }
 
     T t;
-};
+};
+
+// basic specialization
+// - TODO: ignored for now since this is annoying
+template <>
+struct TBasic<int> {
+    int add5() { return 5; }
+};

tests/test_ft_misc.py

@@ -146,6 +146,15 @@ def test_cpp_code_with_constant():
     assert o.cpp_code_with_constant() == 4
 
 
+#
+# ns_class.h
+#
+
+
+def test_ns_class():
+    assert ft._rpytest_ft.NSClass().getN() == 4
+
+
 #
 # operators.h
 #