Fix simplification of operator->

danmar · Jul 11, 2023 · c054ccf · c054ccf
1 parent 8a14ac3
commit c054ccf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -2469,7 +2469,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
                 if (!end || !scope || !Token::simpleMatch(end->astParent(), "."))
                     return false;
                 auto it = std::find_if(scope->functionList.begin(), scope->functionList.end(), [](const Function& f) {
-                    return f.isConst() && f.name() == "operator.";
+                    return f.isConst() && f.name() == "operator->";
                 });
                 if (it == scope->functionList.end() || !it->retType || !it->retType->classScope)
                     return false;

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -9778,7 +9778,7 @@ void Tokenizer::simplifyOperatorName()
                 if (par->str() == "," && !op.empty())
                     break;
                 if (!(Token::Match(par, "<|>") && !op.empty())) {
-                    op += par->str();
+                    op += par->str() == "." ? par->originalName() : par->str();
                     par = par->next();
                     done = false;
                 }

diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -8370,7 +8370,7 @@ class TestClass : public TestFixture {
                       "struct TPtr : public SPtr {\n"
                       "    T* operator->() const { return (T*)p; }\n"
                       "};\n");
-        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:8]: (style) The function 'operator.' overrides a function in a base class but is not marked with a 'override' specifier.\n",
+        ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:8]: (style) The function 'operator->' overrides a function in a base class but is not marked with a 'override' specifier.\n",
                       errout.str());
     }
 

diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -4950,7 +4950,7 @@ class TestTokenizer : public TestFixture {
         const char code[] = "void f() {"
                             "static_cast<ScToken*>(xResult.operator->())->GetMatrix();"
                             "}";
-        const char result[] = "void f ( ) { static_cast < ScToken * > ( xResult . operator. ( ) ) . GetMatrix ( ) ; }";
+        const char result[] = "void f ( ) { static_cast < ScToken * > ( xResult . operator-> ( ) ) . GetMatrix ( ) ; }";
         ASSERT_EQUALS(result, tokenizeAndStringify(code));
     }