Preprocessor: small error() refactoring

Author: firewave

lib/preprocessor.cpp

@@ -914,6 +914,11 @@ static std::string simplecppErrToId(simplecpp::Output::Type type)
 }
 
 void Preprocessor::error(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg, simplecpp::Output::Type type)
+{
+    error(filename, linenr, col, msg, simplecppErrToId(type));
+}
+
+void Preprocessor::error(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg, const std::string& id)
 {
     std::list<ErrorMessage::FileLocation> locationList;
     if (!filename.empty()) {
@@ -927,7 +932,7 @@ void Preprocessor::error(const std::string &filename, unsigned int linenr, unsig
                                         mFile0,
                                         Severity::error,
                                         msg,
-                                        simplecppErrToId(type),
+                                        id,
                                         Certainty::normal));
 }
 
@@ -939,6 +944,7 @@ void Preprocessor::missingInclude(const std::string &filename, unsigned int line
 
     std::list<ErrorMessage::FileLocation> locationList;
     if (!filename.empty()) {
+        // TODO: add relative path handling?
         locationList.emplace_back(filename, linenr, col);
     }
     ErrorMessage errmsg(std::move(locationList), mFile0, Severity::information,

lib/preprocessor.h

@@ -159,6 +159,7 @@ class CPPCHECKLIB WARN_UNUSED Preprocessor {
     };
 
     void missingInclude(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &header, HeaderTypes headerType);
+    void error(const std::string &filename, unsigned int linenr, unsigned int col, const std::string &msg, const std::string& id);
 
     void addRemarkComments(const simplecpp::TokenList &tokens, std::vector<RemarkComment> &remarkComments) const;