small simplecpp::TokenList usage cleanup (danmar#7438)

Author: firewave

lib/cppcheck.cpp

@@ -907,16 +907,16 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
                 // enforce the language since markup files are special and do not adhere to the enforced language
                 tokenizer.list.setLang(Standards::Language::C, true);
                 if (fileStream) {
-                    std::vector<std::string> files{file.spath()};
-                    simplecpp::TokenList tokens(*fileStream, files);
+                    std::vector<std::string> files;
+                    simplecpp::TokenList tokens(*fileStream, files, file.spath());
                     if (analyzerInformation) {
                         const Preprocessor preprocessor(mSettings, mErrorLogger);
                         hash = calculateHash(preprocessor, tokens, mSettings, mSuppressions);
                     }
                     tokenizer.list.createTokens(std::move(tokens));
                 }
                 else {
-                    std::vector<std::string> files{file.spath()};
+                    std::vector<std::string> files;
                     simplecpp::TokenList tokens(file.spath(), files);
                     if (analyzerInformation) {
                         const Preprocessor preprocessor(mSettings, mErrorLogger);

test/testpreprocessor.cpp

@@ -61,13 +61,16 @@ class TestPreprocessor : public TestFixture {
         return tokens2.stringify();
     }
 
-    static void preprocess(const char code[], std::vector<std::string> &files, TokenList& tokenlist, const simplecpp::DUI& dui)
+    static void preprocess(const char code[], std::vector<std::string> &files, const std::string& file0, TokenList& tokenlist, const simplecpp::DUI& dui)
     {
+        if (!files.empty())
+            throw std::runtime_error("file list not empty");
+
         if (tokenlist.front())
             throw std::runtime_error("token list not empty");
 
         std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
+        const simplecpp::TokenList tokens1(istr, files, file0);
 
         // Preprocess..
         simplecpp::TokenList tokens2(files);
@@ -81,9 +84,9 @@ class TestPreprocessor : public TestFixture {
 
     static std::vector<RemarkComment> getRemarkComments(const char code[], ErrorLogger& errorLogger)
     {
-        std::vector<std::string> files{"test.cpp"};
+        std::vector<std::string> files;
         std::istringstream istr(code);
-        const simplecpp::TokenList tokens1(istr, files, files[0]);
+        const simplecpp::TokenList tokens1(istr, files, "test.cpp");
 
         const Settings settings;
 
@@ -2570,44 +2573,48 @@ class TestPreprocessor : public TestFixture {
     }
 
     void standard() const {
-        std::vector<std::string> files = {"test.cpp"};
 
         const char code[] = "int a;";
         // TODO: this bypasses the standard determined from the settings - the parameter should not be exposed
         simplecpp::DUI dui;
 
         {
             dui.std = "c89";
+            std::vector<std::string> files;
             TokenList tokenlist{&settingsDefault};
-            preprocess(code, files, tokenlist, dui);
+            preprocess(code, files, "test.cpp", tokenlist, dui);
             ASSERT(tokenlist.front());
         }
 
         {
             dui.std = "gnu23";
+            std::vector<std::string> files;
             TokenList tokenlist{&settingsDefault};
-            preprocess(code, files, tokenlist, dui);
+            preprocess(code, files, "test.cpp", tokenlist, dui);
             ASSERT(tokenlist.front());
         }
 
         {
             dui.std = "c++98";
+            std::vector<std::string> files;
             TokenList tokenlist{&settingsDefault};
-            preprocess(code, files, tokenlist, dui);
+            preprocess(code, files, "test.cpp", tokenlist, dui);
             ASSERT(tokenlist.front());
         }
 
         {
             dui.std = "gnu++26";
+            std::vector<std::string> files;
             TokenList tokenlist{&settingsDefault};
-            preprocess(code, files, tokenlist, dui);
+            preprocess(code, files, "test.cpp", tokenlist, dui);
             ASSERT(tokenlist.front());
         }
 
         {
             dui.std = "gnu77";
+            std::vector<std::string> files;
             TokenList tokenlist{&settingsDefault};
-            preprocess(code, files, tokenlist, dui);
+            preprocess(code, files, "test.cpp", tokenlist, dui);
             ASSERT(!tokenlist.front()); // nothing is tokenized when an unknown standard is provided
         }
     }

test/testtokenize.cpp

@@ -553,7 +553,7 @@ class TestTokenizer : public TestFixture {
         Preprocessor preprocessor(settings, *this);
         std::istringstream istr(filedata);
         simplecpp::OutputList outputList;
-        std::vector<std::string> files{filename};
+        std::vector<std::string> files;
         const simplecpp::TokenList tokens1(istr, files, filename, &outputList);
         std::list<Directive> directives = preprocessor.createDirectives(tokens1);