Make typedef detection simpler

virtuald · virtuald · commit f67e878c76f6 · 2020-12-09T02:18:38.000-05:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -3289,10 +3289,14 @@ def _evaluate_stack(self, token=None):
         except:
             pass
 
+        if len(self.nameStack) == 0:
+            debug_print("trace (Empty Stack)")
+            return
+
         # if 'typedef' in self.nameStack: self._evaluate_typedef()        # allows nested typedefs, probably a bad idea
-        if (
+        elif (
             not self.curClass
-            and "typedef" in self.nameStack
+            and self.nameStack[0] == "typedef"
             and (
                 self.stack[-1] == ";"
                 or (
@@ -3307,9 +3311,6 @@ def _evaluate_stack(self, token=None):
             self._evaluate_typedef()
             return
 
-        elif len(self.nameStack) == 0:
-            debug_print("trace (Empty Stack)")
-            return
         elif self.nameStack[0] == "namespace":
             # Taken care of outside of here
             pass
