Merge pull request #60 from robotpy/clear-template

virtuald · web-flow · commit 849cf50177ff · 2021-01-12T00:33:28.000-05:00
Clear templates after using them
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -2346,6 +2346,10 @@ def _evaluate_method_stack(self):
                 )
                 newMethod["parent"] = None
                 self.functions.append(newMethod)
+
+            # Reset template once it has been used
+            self.curTemplate = None
+
             global parseHistory
             parseHistory.append(
                 {
@@ -2549,6 +2553,7 @@ def _evaluate_class_stack(self):
                 self._get_location(self.nameStack),
                 self.curAccessSpecifier,
             )
+            self.curTemplate = None
         newClass["declaration_method"] = self.nameStack[0]
         self.classes_order.append(newClass)  # good idea to save ordering
         self.stack = []  # fixes if class declared with ';' in closing brace
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3978,5 +3978,37 @@ def test_fn(self):
         self.assertEqual("N1::N2", c["namespace"])
 
 
+class TemplateMustBeCleared(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+template <int States, int Inputs> class LinearPlantInversionFeedforward {
+public:
+  template <int Outputs>
+  LinearPlantInversionFeedforward(
+      const LinearSystem<States, Inputs, Outputs> &plant, units::second_t dt)
+      : LinearPlantInversionFeedforward(plant.A(), plant.B(), dt) {}
+
+  LinearPlantInversionFeedforward(
+      const Eigen::Matrix<double, States, States> &A,
+      const Eigen::Matrix<double, States, Inputs> &B, units::second_t dt)
+      : m_dt(dt) {
+    DiscretizeAB<States, Inputs>(A, B, dt, &m_A, &m_B);
+
+    m_r.setZero();
+    Reset(m_r);
+  }
+};
+""",
+            "string",
+        )
+
+    def test_fn(self):
+        c = self.cppHeader.classes["LinearPlantInversionFeedforward"]
+        self.assertEqual("LinearPlantInversionFeedforward", c["name"])
+        self.assertEqual("template<int Outputs>", c["methods"]["public"][0]["template"])
+        self.assertEqual(False, c["methods"]["public"][1]["template"])
+
+
 if __name__ == "__main__":
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -2346,6 +2346,10 @@ def _evaluate_method_stack(self):`
`2346`	`2346`	`)`
`2347`	`2347`	`newMethod["parent"] = None`
`2348`	`2348`	`self.functions.append(newMethod)`
	`2349`	`+`
	`2350`	`+ # Reset template once it has been used`
	`2351`	`+ self.curTemplate = None`
	`2352`	`+`
`2349`	`2353`	`global parseHistory`
`2350`	`2354`	`parseHistory.append(`
`2351`	`2355`	`{`
`@@ -2549,6 +2553,7 @@ def _evaluate_class_stack(self):`
`2549`	`2553`	`self._get_location(self.nameStack),`
`2550`	`2554`	`self.curAccessSpecifier,`
`2551`	`2555`	`)`
	`2556`	`+ self.curTemplate = None`
`2552`	`2557`	`newClass["declaration_method"] = self.nameStack[0]`
`2553`	`2558`	`self.classes_order.append(newClass) # good idea to save ordering`
`2554`	`2559`	`self.stack = [] # fixes if class declared with ';' in closing brace`