Fixed language type for non-braced extern not reverting after semicolon

Semicolon is now considered a token and causes an extra extern brace pop like a
closing curly brace does.

Author: calcmogul

wpiformat/test/test_cidentlist.py

@@ -171,6 +171,43 @@ def test_cidentlist():
         "#endif" + os.linesep))
     outputs.append((inputs[len(inputs) - 1][1], False, True))
 
+    inputs.append(("./Timer.hpp",
+        "extern \"C\" void Timer1IntHandler();" + os.linesep + \
+        os.linesep + \
+        "class Timer {" + os.linesep + \
+        "public:" + os.linesep + \
+        "    void Set(uint32_t newTime);" + os.linesep + \
+        os.linesep + \
+        "    void Start();" + os.linesep + \
+        os.linesep + \
+        "    void Stop();" + os.linesep + \
+        os.linesep + \
+        "    uint16_t GetID() const;" + os.linesep + \
+        os.linesep + \
+        "    static uint32_t GetTime();" + os.linesep + \
+        os.linesep + \
+        "private:" + os.linesep + \
+        "    friend void Timer1IntHandler();" + os.linesep + \
+        "};" + os.linesep))
+    outputs.append((
+        "extern \"C\" void Timer1IntHandler(void);" + os.linesep + \
+        os.linesep + \
+        "class Timer {" + os.linesep + \
+        "public:" + os.linesep + \
+        "    void Set(uint32_t newTime);" + os.linesep + \
+        os.linesep + \
+        "    void Start();" + os.linesep + \
+        os.linesep + \
+        "    void Stop();" + os.linesep + \
+        os.linesep + \
+        "    uint16_t GetID() const;" + os.linesep + \
+        os.linesep + \
+        "    static uint32_t GetTime();" + os.linesep + \
+        os.linesep + \
+        "private:" + os.linesep + \
+        "    friend void Timer1IntHandler();" + os.linesep + \
+        "};" + os.linesep, True, True))
+
     assert len(inputs) == len(outputs)
 
     config_file = Config(os.path.abspath(os.getcwd()), ".styleguide")

wpiformat/wpiformat/cidentlist.py

@@ -32,7 +32,7 @@ def run_pipeline(self, config_file, name, lines):
         # "def\\s+\w+" matches preprocessor directives "#ifdef" and "#ifndef" so
         # their contents aren't used as a return type.
         extern_str = "(?P<ext_decl>extern \"C(\+\+)?\")\s+(?P<ext_brace>\{)?|"
-        braces_str = "\{|\}|def\s+\w+|\w+\s+\w+\s*(?P<paren>\(\))"
+        braces_str = "\{|\}|;|def\s+\w+|\w+\s+\w+\s*(?P<paren>\(\))"
         postfix_str = "(?=\s*(;|\{))"
         token_regex = re.compile(extern_str + braces_str + postfix_str)
 
@@ -54,6 +54,12 @@ def run_pipeline(self, config_file, name, lines):
             elif token == "}":
                 is_c = extern_brace_indices.pop()
 
+                # If the next stack frame is from an extern without braces, pop
+                # it.
+                if extern_brace_indices[-1] >= EXTRA_POP_OFFSET:
+                    is_c = extern_brace_indices[-1] - EXTRA_POP_OFFSET
+                    extern_brace_indices.pop()
+            elif token == ";":
                 # If the next stack frame is from an extern without braces, pop
                 # it.
                 if extern_brace_indices[-1] >= EXTRA_POP_OFFSET:
@@ -66,7 +72,7 @@ def run_pipeline(self, config_file, name, lines):
                 else:
                     # Handling an extern without braces changing the language
                     # type is done by treating it as a pseudo-brace that gets
-                    # popped as well when the next "}" is encountered.
+                    # popped as well when the next "}" or ";" is encountered.
                     # The "extra pop" offset is used as a flag on the top stack
                     # value that is checked whenever a pop is performed.
                     extern_brace_indices.append(is_c + EXTRA_POP_OFFSET)