Ticket #7891: Do not remove spaces in the internal representation for template instantiations.

Author: simartin

lib/templatesimplifier.cpp

@@ -435,12 +435,8 @@ std::set<std::string> TemplateSimplifier::expandSpecialized(Token *tokens)
             s = ostr.str();
         }
 
-        // save search pattern..
-        const std::string pattern(s + " >");
-
         // remove spaces to create new name
-        s.erase(std::remove(s.begin(), s.end(), ' '), s.end());
-        const std::string name(s + ">");
+        const std::string name(s + " >");
         expandedtemplates.insert(name);
 
         // Rename template..
@@ -452,7 +448,7 @@ std::set<std::string> TemplateSimplifier::expandSpecialized(Token *tokens)
         tok->deleteThis();
 
         // Use this special template in the code..
-        while (nullptr != (tok2 = const_cast<Token *>(Token::findsimplematch(tok2, pattern.c_str())))) {
+        while (nullptr != (tok2 = const_cast<Token *>(Token::findsimplematch(tok2, name.c_str())))) {
             Token::eraseTokens(tok2, Token::findsimplematch(tok2, "<")->findClosingBracket()->next());
             tok2->str(name);
         }
@@ -1264,7 +1260,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
         // New type..
         std::vector<const Token *> typesUsedInTemplateInstantiation;
         std::string typeForNewName;
-        std::string templateMatchPattern(name + " < ");
+        std::string typeForPatternMatch;
         unsigned int indentlevel = 0;
         for (const Token *tok3 = tok2->tokAt(2); tok3 && (indentlevel > 0 || tok3->str() != ">"); tok3 = tok3->next()) {
             // #2648 - unhandled parentheses => bail out
@@ -1281,13 +1277,14 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
                 ++indentlevel;
             else if (indentlevel > 0 && Token::Match(tok3, "> [,>]"))
                 --indentlevel;
-            bool constconst = tok3->str() == "const" && tok3->strAt(1) == "const";
-            if (!constconst) {
-                templateMatchPattern += tok3->str();
-                templateMatchPattern += ' ';
-            }
             if (indentlevel == 0 && Token::Match(tok3->previous(), "[<,]"))
                 typesUsedInTemplateInstantiation.push_back(tok3);
+            const bool constconst = tok3->str() == "const" && tok3->strAt(1) == "const";
+            if (!constconst) {
+                if (!typeForPatternMatch.empty())
+                    typeForPatternMatch += ' ';
+                typeForPatternMatch += tok3->str();
+            }
             // add additional type information
             if (!constconst && tok3->str() != "class") {
                 if (tok3->isUnsigned())
@@ -1296,10 +1293,12 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
                     typeForNewName += "signed";
                 if (tok3->isLong())
                     typeForNewName += "long";
+                if (!typeForNewName.empty())
+                    typeForNewName += ' ';
                 typeForNewName += tok3->str();
             }
         }
-        templateMatchPattern += ">";
+        std::string templateMatchPattern(name + " < " + typeForPatternMatch + " >");
 
         if (typeForNewName.empty() || typeParametersInDeclaration.size() != typesUsedInTemplateInstantiation.size()) {
             if (printDebug && errorlogger) {
@@ -1313,7 +1312,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
         }
 
         // New classname/funcname..
-        const std::string newName(name + "<" + typeForNewName + ">");
+        const std::string newName(name + " < " + typeForNewName + " >");
 
         if (expandedtemplates.find(newName) == expandedtemplates.end()) {
             expandedtemplates.insert(newName);

test/testclass.cpp

@@ -2140,7 +2140,7 @@ class TestClass : public TestFixture {
                                "};\n"
                                "\n"
                                "AA<double> *p = new B; delete p;");
-        ASSERT_EQUALS("[test.cpp:9]: (error) Class 'AA<double>' which is inherited by class 'B' does not have a virtual destructor.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:9]: (error) Class 'AA < double >' which is inherited by class 'B' does not have a virtual destructor.\n", errout.str());
     }
 
     void virtualDestructorInconclusive() {