Fix weird handling of remark comments

Author: glankk

lib/cppcheck.cpp

@@ -100,9 +100,9 @@ class CppCheck::CppCheckLogger : public ErrorLogger
         closePlist();
     }
 
-    std::vector<RemarkComment>& remarkComments()
+    void addRemarkComments(std::vector<RemarkComment> remarkComments)
     {
-        return mRemarkComments;
+        mRemarkComments.insert(mRemarkComments.end(), remarkComments.begin(), remarkComments.end());
     }
 
     void setLocationMacros(const Token* startTok, const std::vector<std::string>& files)
@@ -1017,7 +1017,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
         }
 
         // Parse comments and then remove them
-        preprocessor.addRemarkComments(mLogger->remarkComments());
+        mLogger->addRemarkComments(preprocessor.getRemarkComments());
         preprocessor.inlineSuppressions(mSuppressions.nomsg);
         preprocessor.removeComments();
 
@@ -1062,7 +1062,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
 
         preprocessor.setLoadCallback([&](simplecpp::FileData &data) {
             // Do preprocessing on included file
-            preprocessor.addRemarkComments(data.tokens, mLogger->remarkComments());
+            mLogger->addRemarkComments(preprocessor.getRemarkComments(data.tokens));
             preprocessor.inlineSuppressions(data.tokens, mSuppressions.nomsg);
             Preprocessor::removeComments(data.tokens);
             Preprocessor::createDirectives(data.tokens, directives);

lib/preprocessor.cpp

@@ -352,17 +352,6 @@ void Preprocessor::inlineSuppressions(const simplecpp::TokenList &tokens, Suppre
     }
 }
 
-// cppcheck-suppress unusedFunction - only used in tests
-std::vector<RemarkComment> Preprocessor::getRemarkComments() const
-{
-    std::vector<RemarkComment> ret;
-    addRemarkComments(mTokens, ret);
-    for (const auto &filedata : mFileCache) {
-        addRemarkComments(filedata->tokens, ret);
-    }
-    return ret;
-}
-
 void Preprocessor::createDirectives(std::list<Directive> &directives) const
 {
     createDirectives(mTokens, directives);
@@ -1173,13 +1162,15 @@ void Preprocessor::simplifyPragmaAsm(simplecpp::TokenList &tokenList)
     }
 }
 
-void Preprocessor::addRemarkComments(std::vector<RemarkComment>& remarkComments) const
+std::vector<RemarkComment> Preprocessor::getRemarkComments() const
 {
-    addRemarkComments(mTokens, remarkComments);
+    return getRemarkComments(mTokens);
 }
 
-void Preprocessor::addRemarkComments(const simplecpp::TokenList &tokens, std::vector<RemarkComment> &remarkComments) const
+std::vector<RemarkComment> Preprocessor::getRemarkComments(const simplecpp::TokenList &tokens) const
 {
+    std::vector<RemarkComment> remarkComments;
+
     for (const simplecpp::Token *tok = tokens.cfront(); tok; tok = tok->next) {
         if (!tok->comment)
             continue;
@@ -1226,4 +1217,6 @@ void Preprocessor::addRemarkComments(const simplecpp::TokenList &tokens, std::ve
         // Add the suppressions.
         remarkComments.emplace_back(relativeFilename, remarkedToken->location.line, remarkText);
     }
+
+    return remarkComments;
 }

lib/preprocessor.h

@@ -120,9 +120,7 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
 
     std::vector<RemarkComment> getRemarkComments() const;
 
-    void addRemarkComments(std::vector<RemarkComment> &remarkComments) const;
-
-    void addRemarkComments(const simplecpp::TokenList &tokens, std::vector<RemarkComment> &remarkComments) const;
+    std::vector<RemarkComment> getRemarkComments(const simplecpp::TokenList &tokens) const;
 
     bool loadFiles(std::vector<std::string> &files);