Fix #13155 (Tokenizer::simplifyTypedef does not set info correctly fo…

…r typedef in function)
danmar · Dec 1, 2024 · 6c81d70 · 6c81d70
1 parent 588ca87
commit 6c81d70
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -2057,10 +2057,13 @@ void Tokenizer::simplifyTypedefCpp()
                             removed1.resize(idx);
                         }
                     }
-                    replStart->isSimplifiedTypedef(true);
                     Token* constTok = Token::simpleMatch(tok2->previous(), "const") ? tok2->previous() : nullptr;
                     // add remainder of type
                     tok2 = TokenList::copyTokens(tok2, typeStart->next(), typeEnd);
+                    for (Token* tok3 = replStart; tok3 != tok2->next(); tok3 = tok3->next()) {
+                        tok3->column(replStart->column());
+                        tok3->isSimplifiedTypedef(true);
+                    }
 
                     if (!pointers.empty()) {
                         for (const std::string &p : pointers) {

diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
@@ -243,6 +243,8 @@ class TestSimplifyTypedef : public TestFixture {
 
         TEST_CASE(simplifyTypedefOriginalName);
 
+        TEST_CASE(simplifyTypedefTokenColumn);
+
         TEST_CASE(typedefInfo1);
 
         TEST_CASE(typedefInfo2);
@@ -4454,6 +4456,24 @@ class TestSimplifyTypedef : public TestFixture {
         ASSERT_EQUALS("rFunctionPointer_fp", token->originalName());
     }
 
+    void simplifyTypedefTokenColumn() {  // #13155
+        const char code[] = "void foo(void) {\n"
+                            "    typedef signed int MY_INT;\n"
+                            "    MY_INT x = 0;\n"
+                            "}";
+
+        Tokenizer tokenizer(settings1, *this);
+        std::istringstream istr(code);
+        ASSERT(tokenizer.list.createTokens(istr, "file.c"));
+        tokenizer.createLinks();
+        tokenizer.simplifyTypedef();
+
+        const Token* x = Token::findsimplematch(tokenizer.list.front(), "x");
+        const Token* type = x->previous();
+        ASSERT_EQUALS("int", type->str());
+        ASSERT_EQUALS(5, type->column());
+    }
+
     void typedefInfo1() {
         const std::string xml = dumpTypedefInfo("typedef int A;\nA x;");
         ASSERT_EQUALS("  <typedef-info>\n"