testrunner: moved Preprocessor object into PreprocessorHelper

danmar · Apr 11, 2024 · 999bc80 · 999bc80
1 parent 1c49488
commit 999bc80
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 120 deletions.
diff --git a/test/helpers.cpp b/test/helpers.cpp
@@ -111,27 +111,28 @@ ScopedFile::~ScopedFile() {
 }
 
 // TODO: we should be using the actual Preprocessor implementation
-std::string PreprocessorHelper::getcode(Preprocessor &preprocessor, const std::string &filedata, const std::string &cfg, const std::string &filename, SuppressionList *inlineSuppression)
+std::string PreprocessorHelper::getcode(const Settings& settings, ErrorLogger& errorlogger, const std::string &filedata, const std::string &cfg, const std::string &filename, SuppressionList *inlineSuppression)
 {
-    std::map<std::string, std::string> cfgcode = getcode(preprocessor, filedata.c_str(), std::set<std::string>{cfg}, filename, inlineSuppression);
+    std::map<std::string, std::string> cfgcode = getcode(settings, errorlogger, filedata.c_str(), std::set<std::string>{cfg}, filename, inlineSuppression);
     const auto it = cfgcode.find(cfg);
     if (it == cfgcode.end())
         return "";
     return it->second;
 }
 
-std::map<std::string, std::string> PreprocessorHelper::getcode(Preprocessor &preprocessor, const char code[], const std::string &filename, SuppressionList *inlineSuppression)
+std::map<std::string, std::string> PreprocessorHelper::getcode(const Settings& settings, ErrorLogger& errorlogger, const char code[], const std::string &filename, SuppressionList *inlineSuppression)
 {
-    return getcode(preprocessor, code, {}, filename, inlineSuppression);
+    return getcode(settings, errorlogger, code, {}, filename, inlineSuppression);
 }
 
-std::map<std::string, std::string> PreprocessorHelper::getcode(Preprocessor &preprocessor, const char code[], std::set<std::string> cfgs, const std::string &filename, SuppressionList *inlineSuppression)
+std::map<std::string, std::string> PreprocessorHelper::getcode(const Settings& settings, ErrorLogger& errorlogger, const char code[], std::set<std::string> cfgs, const std::string &filename, SuppressionList *inlineSuppression)
 {
     simplecpp::OutputList outputList;
     std::vector<std::string> files;
 
     std::istringstream istr(code);
     simplecpp::TokenList tokens(istr, files, Path::simplifyPath(filename), &outputList);
+    Preprocessor preprocessor(settings, errorlogger);
     if (inlineSuppression)
         preprocessor.inlineSuppressions(tokens, *inlineSuppression);
     tokens.removeComments();
@@ -155,10 +156,6 @@ std::map<std::string, std::string> PreprocessorHelper::getcode(Preprocessor &pre
         }
     }
 
-    // Since "files" is a local variable the tracking info must be cleared..
-    preprocessor.mMacroUsage.clear();
-    preprocessor.mIfCond.clear();
-
     return cfgcode;
 }
 

diff --git a/test/helpers.h b/test/helpers.h
@@ -148,14 +148,14 @@ class PreprocessorHelper
      * @param filename name of source file
      * @param inlineSuppression the inline suppressions
      */
-    static std::string getcode(Preprocessor &preprocessor, const std::string &filedata, const std::string &cfg, const std::string &filename, SuppressionList *inlineSuppression = nullptr);
-    static std::map<std::string, std::string> getcode(Preprocessor &preprocessor, const char code[], const std::string &filename = "file.c", SuppressionList *inlineSuppression = nullptr);
+    static std::string getcode(const Settings& settings, ErrorLogger& errorlogger, const std::string &filedata, const std::string &cfg, const std::string &filename, SuppressionList *inlineSuppression = nullptr);
+    static std::map<std::string, std::string> getcode(const Settings& settings, ErrorLogger& errorlogger, const char code[], const std::string &filename = "file.c", SuppressionList *inlineSuppression = nullptr);
 
     static void preprocess(const char code[], std::vector<std::string> &files, Tokenizer& tokenizer, ErrorLogger& errorlogger);
     static void preprocess(const char code[], std::vector<std::string> &files, Tokenizer& tokenizer, ErrorLogger& errorlogger, const simplecpp::DUI& dui);
 
 private:
-    static std::map<std::string, std::string> getcode(Preprocessor &preprocessor, const char code[], std::set<std::string> cfgs, const std::string &filename = "file.c", SuppressionList *inlineSuppression = nullptr);
+    static std::map<std::string, std::string> getcode(const Settings& settings, ErrorLogger& errorlogger, const char code[], std::set<std::string> cfgs, const std::string &filename = "file.c", SuppressionList *inlineSuppression = nullptr);
 };
 
 namespace cppcheck {