Merge pull request #44 from Chaste/fix-excluded-overrides

Fix excluded overrides
Chaste · Jun 24, 2024 · a2ffdb6 · a2ffdb6
2 parents 26a4074 + 8ecfce9
commit a2ffdb6
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 9 deletions.
diff --git a/cppwg/input/info_helper.py b/cppwg/input/info_helper.py
@@ -139,7 +139,8 @@ def extract_templates_from_source(self, feature_info: BaseInfo) -> None:
                         template_params = []
                         for tp in template_substitution["signature"].split(","):
                             template_params.append(
-                                tp.replace("<", "")
+                                tp.strip()
+                                .replace("<", "")
                                 .replace(">", "")
                                 .split(" ")[1]
                                 .split("=")[0]

diff --git a/cppwg/writers/class_writer.py b/cppwg/writers/class_writer.py
@@ -336,11 +336,6 @@ def write(self, work_dir: str) -> None:
             for member_function in class_decl.member_functions(
                 function=query, allow_empty=True
             ):
-                if self.class_info.excluded_methods:
-                    # Skip excluded methods
-                    if member_function.name in self.class_info.excluded_methods:
-                        continue
-
                 method_writer = CppMethodWrapperWriter(
                     self.class_info,
                     idx,

diff --git a/cppwg/writers/method_writer.py b/cppwg/writers/method_writer.py
@@ -65,7 +65,12 @@ def exclude(self) -> bool:
         bool
             True if the method should be excluded, False otherwise
         """
-        # Exclude private methods without over-rides
+        # Skip methods marked for exclusion
+        if self.class_info.excluded_methods:
+            if self.method_decl.name in self.class_info.excluded_methods:
+                return True
+
+        # Exclude private methods
         if self.method_decl.access_type == "private":
             return True
 
@@ -220,8 +225,8 @@ def generate_virtual_override_wrapper(self) -> str:
         str
             The virtual override wrapper code.
         """
-        # Skip private methods
-        if self.method_decl.access_type == "private":
+        # Skip excluded methods
+        if self.exclude():
             return ""
 
         # Get list of arguments and types

diff --git a/examples/shapes/src/mesh/AbstractMesh.cpp b/examples/shapes/src/mesh/AbstractMesh.cpp
@@ -22,5 +22,10 @@ void AbstractMesh<ELEMENT_DIM, SPACE_DIM>::SetIndex(unsigned index)
     mIndex = index;
 }
 
+template <unsigned ELEMENT_DIM, unsigned SPACE_DIM>
+void AbstractMesh<ELEMENT_DIM, SPACE_DIM>::AddVertex(Point<SPACE_DIM> vertex)
+{
+}
+
 template class AbstractMesh<2, 2>;
 template class AbstractMesh<3, 3>;
diff --git a/examples/shapes/src/mesh/AbstractMesh.hpp b/examples/shapes/src/mesh/AbstractMesh.hpp
@@ -1,6 +1,8 @@
 #ifndef _ABSTRACT_MESH_HPP
 #define _ABSTRACT_MESH_HPP
 
+#include "Point.hpp"
+
 /**
  * A mesh in SPACE_DIM space with ELEMENT_DIM dimensional elements
  */
@@ -34,6 +36,11 @@ class AbstractMesh
      */
     void SetIndex(unsigned index);
 
+    /**
+     * Add a vertex to the mesh
+     */
+    void AddVertex(Point<SPACE_DIM> vertex);
+
     /**
      * Scale the mesh by a factor
      */

diff --git a/examples/shapes/wrapper/mesh/AbstractMesh2_2.cppwg.cpp b/examples/shapes/wrapper/mesh/AbstractMesh2_2.cppwg.cpp
@@ -31,6 +31,10 @@ py::class_<AbstractMesh2_2 , AbstractMesh2_2_Overrides , std::shared_ptr<Abstrac
             "SetIndex",
             (void(AbstractMesh2_2::*)(unsigned int)) &AbstractMesh2_2::SetIndex,
             " " , py::arg("index") )
+        .def(
+            "AddVertex",
+            (void(AbstractMesh2_2::*)(::Point<2>)) &AbstractMesh2_2::AddVertex,
+            " " , py::arg("vertex") )
         .def(
             "Scale",
             (void(AbstractMesh2_2::*)(double const)) &AbstractMesh2_2::Scale,

diff --git a/examples/shapes/wrapper/mesh/AbstractMesh3_3.cppwg.cpp b/examples/shapes/wrapper/mesh/AbstractMesh3_3.cppwg.cpp
@@ -31,6 +31,10 @@ py::class_<AbstractMesh3_3 , AbstractMesh3_3_Overrides , std::shared_ptr<Abstrac
             "SetIndex",
             (void(AbstractMesh3_3::*)(unsigned int)) &AbstractMesh3_3::SetIndex,
             " " , py::arg("index") )
+        .def(
+            "AddVertex",
+            (void(AbstractMesh3_3::*)(::Point<3>)) &AbstractMesh3_3::AddVertex,
+            " " , py::arg("vertex") )
         .def(
             "Scale",
             (void(AbstractMesh3_3::*)(double const)) &AbstractMesh3_3::Scale,