Fix #12008 debug: Executable scope 'x' with unknown function. (danmar…

…#5588)
chrchr-github · Oct 25, 2023 · 80c5cb6 · 80c5cb6
1 parent 502d7ea
commit 80c5cb6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1693,7 +1693,7 @@ void Tokenizer::simplifyTypedefCpp()
                         } else {
                             if (scope == 0 && !(classLevel > 1 && tok2 == spaceInfo[classLevel - 1].bodyEnd))
                                 break;
-                            --scope;
+                            scope = std::max(scope - 1, 0);
                         }
                     }
 

diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
@@ -3395,6 +3395,18 @@ class TestSimplifyTypedef : public TestFixture {
                "void N::T::f(V*) {}\n"
                "namespace N {}\n";
         ASSERT_EQUALS("namespace N { struct S { } ; struct T { void f ( int * ) ; } ; } void N :: T :: f ( int * ) { }", tok(code));
+
+        code = "namespace N {\n" // #12008
+               "    typedef char U;\n"
+               "    typedef int V;\n"
+               "    struct S {\n"
+               "        S(V* v);\n"
+               "    };\n"
+               "}\n"
+               "void f() {}\n"
+               "N::S::S(V* v) {}\n"
+               "namespace N {}\n";
+        ASSERT_EQUALS("namespace N { struct S { S ( int * v ) ; } ; } void f ( ) { } N :: S :: S ( int * v ) { }", tok(code));
     }
 
     void simplifyTypedef147() {