Fix #11506 debug: simplifyUsing: unmatched body end (#4728)

Author: chrchr-github

lib/tokenize.cpp

@@ -1360,7 +1360,7 @@ void Tokenizer::simplifyTypedef()
                     const bool sameStartEnd = (typeStart == typeEnd);
 
                     // check for derived class: class A : some_typedef {
-                    const bool isDerived = Token::Match(tok2->previous(), "public|protected|private %type% {|,");
+                    const bool isDerived = Token::Match(tok2->previous(), "public|protected|private|: %type% {|,");
 
                     // check for cast: (some_typedef) A or static_cast<some_typedef>(A)
                     // todo: check for more complicated casts like: (const some_typedef *)A

test/testsimplifytypedef.cpp

@@ -189,6 +189,7 @@ class TestSimplifyTypedef : public TestFixture {
         TEST_CASE(simplifyTypedef140); // #10798
         TEST_CASE(simplifyTypedef141); // #10144
         TEST_CASE(simplifyTypedef142); // T() when T is a pointer type
+        TEST_CASE(simplifyTypedef143); // #11506
         TEST_CASE(simplifyTypedef144); // #9353
 
         TEST_CASE(simplifyTypedefFunction1);
@@ -3071,6 +3072,16 @@ class TestSimplifyTypedef : public TestFixture {
         ASSERT_EQUALS("void f ( int * = ( int * ) 0 ) { }", tok(code2));
     }
 
+    void simplifyTypedef143() { // #11506
+        const char code[] = "typedef struct { int i; } B;\n"
+                            "void f() {\n"
+                            "    struct D : B {\n"
+                            "        char c;\n"
+                            "    };\n"
+                            "}\n";
+        ASSERT_EQUALS("struct B { int i ; } ; void f ( ) { struct D : B { char c ; } ; }", tok(code));
+    }
+
     void simplifyTypedef144() { // #9353
         const char code[] = "typedef struct {} X;\n"
                             "std::vector<X> v;\n";