Only do noexcept processing when needed

virtuald · virtuald · commit bcaa2db1c10e · 2020-01-05T16:27:51.000-05:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -983,29 +983,32 @@ def __init__(self, nameStack, curClass, methinfo, curTemplate, doxygen, location
         self["rtnType"] = self["rtnType"].replace(" ,", ",")
 
         # deal with "noexcept" specifier/operator
-        cleaned = []
-        hit = False
-        parentCount = 0
-        self["noexcept"] = ""
-        for a in nameStack:
-            if a == "noexcept":
-                hit = True
-            if hit:
-                if a == "(":
-                    parentCount += 1
-                elif a == ")":
-                    parentCount -= 1
-                elif parentCount == 0 and a != "noexcept":
-                    hit = False
+        self["noexcept"] = None
+        if "noexcept" in nameStack:
+            noexcept_idx = nameStack.index("noexcept")
+            hit = True
+            cleaned = nameStack[:noexcept_idx]
+            parentCount = 0
+            noexcept = "noexcept"
+            for a in nameStack[noexcept_idx + 1 :]:
+                if a == "noexcept":
+                    hit = True
+                if hit:
+                    if a == "(":
+                        parentCount += 1
+                    elif a == ")":
+                        parentCount -= 1
+                    elif parentCount == 0 and a != "noexcept":
+                        hit = False
+                        cleaned.append(a)
+                        continue  # noexcept without parenthesis
+                    if a == ")" and parentCount == 0:
+                        hit = False
+                    noexcept += a
+                else:
                     cleaned.append(a)
-                    continue  # noexcept without parenthesis
-                if a == ")" and parentCount == 0:
-                    hit = False
-                self["noexcept"] += a
-            else:
-                cleaned.append(a)
-        nameStack = cleaned
-        self["noexcept"] = self["noexcept"] if self["noexcept"] else None
+            self["noexcept"] = noexcept
+            nameStack = cleaned
 
         for spec in ["const", "final", "override"]:
             self[spec] = False
