Interpret using declarations in a class as a possible overload

Author: virtuald

robotpy_build/autowrap/cxxparser.py

@@ -451,6 +451,16 @@ def on_using_declaration(self, state: AWState, using: UsingDecl) -> None:
 
         if using.access is None:
             self.hctx.using_declarations.append(using.typename)
+        elif isinstance(state, ClassBlockState):
+            # A using declaration might bring in a colliding name for a function,
+            # so mark it as overloaded
+            lseg = using.typename.segments[-1]
+            if isinstance(lseg, NameSpecifier):
+                cdata = state.user_data
+                name = lseg.name
+                self.gendata.add_using_decl(
+                    name, cdata.cls_key, cdata.data, state.access == "private"
+                )
 
     #
     # Enums

robotpy_build/autowrap/generator_data.py

@@ -145,6 +145,24 @@ def get_function_data(
         report_data.tracker.add_overload()
         return data, report_data.tracker
 
+    def add_using_decl(
+        self, name: str, cls_key: str, cls_data: ClassData, is_private: bool
+    ):
+        # copied from get_function_data
+        data = cls_data.methods.get(name)
+        report_base = self.classes[cls_key].functions
+
+        report_data = report_base.get(name)
+        if not report_data:
+            report_data = FnReportData()
+            report_base[name] = report_data
+
+        missing = data is None
+        report_data.missing = missing and not is_private
+
+        # We count this as an overload because it might be
+        report_data.tracker.add_overload()
+
     def get_cls_prop_data(
         self, name: str, cls_key: str, cls_data: ClassData
     ) -> PropData:

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

@@ -35,5 +35,16 @@ struct Using4 {
     int getX(const FwdDecl&);
 };
 
+struct Using5a {
+    virtual ~Using5a() {}
+    void fn(int arg) {}
+};
+
+struct Using5b : Using5a {
+    // this collides but isn't picked up without interpreting the using
+    using Using5a::fn;
+    void fn(bool arg) {}
+};
+
 } // namespace u2
 } // namespace u