Properly handle 'extern "C"' namespaces

virtuald · virtuald · commit 43c65dcc663b · 2020-01-03T14:20:23.000-05:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -3170,6 +3170,10 @@ def _evaluate_stack(self, token=None):
         elif self.nameStack[0] == "namespace":
             # Taken care of outside of here
             pass
+        elif len(self.nameStack) == 2 and self.nameStack[0] == "extern":
+            debug_print("trace extern")
+            self.stack = []
+            self.stmtTokens = []
         elif (
             len(self.nameStack) == 2 and self.nameStack[0] == "friend"
         ):  # friend class declaration
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3545,5 +3545,39 @@ def test_nothing(self):
         pass
 
 
+class ExternInline_TestCase(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+extern "C++" {
+inline HAL_Value HAL_GetSimValue(HAL_SimValueHandle handle) {
+  HAL_Value v;
+  return v;
+}
+}  // extern "C++"
+
+""",
+            "string",
+        )
+
+    def test_fn(self):
+        self.assertEqual(self.cppHeader.variables, [])
+        self.assertEqual(len(self.cppHeader.functions), 1)
+        fn = self.cppHeader.functions[0]
+        self.assertEqual(fn["name"], "HAL_GetSimValue")
+        self.assertEqual(
+            filter_pameters(fn["parameters"], ["namespace", "raw_type"]),
+            [
+                {
+                    "type": "HAL_SimValueHandle",
+                    "name": "handle",
+                    "desc": None,
+                    "namespace": "",
+                    "raw_type": "HAL_SimValueHandle",
+                },
+            ],
+        )
+
+
 if __name__ == "__main__":
     unittest.main()
