Class name in YAML must have namespace now

Author: virtuald

robotpy_build/autowrap/cxxparser.py

@@ -792,10 +792,14 @@ def _process_class_name(
 
         if not isinstance(parent, ClassBlockState):
             # 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}"
+
+            if cls_namespace:
+                cls_key = f"{cls_namespace}::{cls_name}"
+            else:
+                cls_key = cls_name
         else:
             # Use things the parent already computed
             cdata = typing.cast(ClassStateData, parent.user_data)

robotpy_build/autowrap/generator_data.py

@@ -84,7 +84,7 @@ def __init__(self, data: AutowrapConfigYaml):
 
     def get_class_data(self, name: str) -> ClassData:
         """
-        The 'name' is [parent_class::]class_name
+        The 'name' is namespace::[parent_class::]class_name
         """
         data = self.data.classes.get(name)
         missing = data is None

robotpy_build/config/autowrap_yml.py

@@ -510,7 +510,7 @@ class AutowrapConfigYaml:
     #:
     attributes: Dict[str, PropData] = dataclasses.field(default_factory=dict)
 
-    #: Key is the class name
+    #: Key is the namespace + class name
     #:
     #: .. code-block:: yaml
     #:

tests/cpp/gen/ft/base_qualname.yml

@@ -1,22 +1,22 @@
 classes:
-  BaseQualname:
+  bq::detail::BaseQualname:
     base_qualnames:
       Hidden: bq::Hidden
     methods:
       BaseQualname:
 
-  THBaseQualname:
+  bq::detail::THBaseQualname:
     base_qualnames:
       THiddenBase1: bq::THiddenBase1<bq::THiddenBase2<int>>
       # parse with _parse_template_decl ... or split it out
 
     methods:
       BaseQualname:
 
-  TVisibleBase1:
+  bq::detail::TVisibleBase1:
     template_params:
     - T
-  TVisibleBase2:
+  bq::detail::TVisibleBase2:
     template_params:
     - T
 

tests/cpp/gen/ft/base_qualname_hidden.yml

@@ -1,8 +1,8 @@
 classes:
-  THiddenBase1:
+  bq::THiddenBase1:
     template_params:
     - T
-  THiddenBase2:
+  bq::THiddenBase2:
     template_params:
     - T
 

tests/cpp/gen/ft/tdependent_param.yml

@@ -1,6 +1,6 @@
 ---
 classes:
-  TDependentParam:
+  whatever::TDependentParam:
     template_params:
     - T
     typealias:

tests/cpp/gen/ft/tdependent_using.yml

@@ -1,6 +1,6 @@
 ---
 classes:
-  TDependentUsing:
+  whatever::TDependentUsing:
     template_params:
     - T
     typealias:

tests/cpp/gen/ft/tdependent_using2.yml

@@ -1,6 +1,6 @@
 ---
 classes:
-  TDependentUsing2:
+  whatever::TDependentUsing2:
     template_params:
     - T
 

tests/cpp/gen/ft/using.yml

@@ -3,6 +3,6 @@ typealias:
 - cr::AlsoCantResolve
 
 classes:
-  ProtectedUsing:
+  cr::inner::ProtectedUsing:
     typealias:
     - cr::CantResolve

tests/cpp/gen/ft/using2.yml

@@ -3,10 +3,10 @@ extra_includes:
 - using.h
 
 classes:
-  fancy_list:
+  u::fancy_list:
     template_params:
     - T
-  Using3:
+  u::u2::Using3:
     typealias:
     - template <typename T> using fancy_list = u::fancy_list<T>