Don't modify mRangeType

danmar · Jan 4, 2024 · 5a15ce2 · 5a15ce2
1 parent 1f9316d
commit 5a15ce2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -822,10 +822,13 @@ namespace {
             }
 
             // don't add class|struct|union in inheritance list
-            if (Token::Match(tok->previous(), "public|private|protected") && Token::Match(mRangeType.first, "const| class|struct|union"))
-                mRangeType.first = mRangeType.first->tokAt(mRangeType.first->str() == "const" ? 2 : 1);
+            auto rangeType = mRangeType;
+            if (Token::Match(tok->previous(), "public|private|protected")) {
+                while (Token::Match(rangeType.first, "const|class|struct|union"))
+                    rangeType.first = rangeType.first->next();
+            }
 
-            Token* const tok2 = insertTokens(tok, mRangeType);
+            Token* const tok2 = insertTokens(tok, rangeType);
             Token* const tok3 = insertTokens(tok2, mRangeTypeQualifiers);
 
             Token *after = tok3;

diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
@@ -1622,13 +1622,14 @@ class TestSimplifyTypedef : public TestFixture {
         }
 
         {
-            const char code[] = "struct B {};\n" // #12141
+            const char code[] = "struct B {};\n"
                                 "typedef const struct B CB;\n"
                                 "namespace N {\n"
                                 "    struct D : public CB {};\n"
-                                "}\n";
+                                "}\n"
+                                "CB cb;\n";
 
-            const char expected[] = "struct B { } ; namespace N { struct D : public B { } ; }";
+            const char expected[] = "struct B { } ; namespace N { struct D : public B { } ; } const struct B cb ;";
             ASSERT_EQUALS(expected, tok(code));
             ASSERT_EQUALS("", errout.str());
         }