removed remaining stream usage from checking

danmar · Sep 23, 2024 · d225248 · d225248
1 parent df92530
commit d225248
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -622,8 +622,7 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string
 {
     return checkInternal(file, cfgname,
                          [&file](TokenList& list) {
-        std::ifstream in(file.spath());
-        list.createTokens(in, file.spath());
+        list.createTokens(file.spath());
     },
                          [&file](std::vector<std::string>& files, simplecpp::OutputList* outputList) {
         return simplecpp::TokenList{file.spath(), files, outputList};

diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -335,13 +335,13 @@ void TokenList::insertTokens(Token *dest, const Token *src, nonneg int n)
 // Tokenize - tokenizes a given file.
 //---------------------------------------------------------------------------
 
-bool TokenList::createTokens(std::istream &code, const std::string& file0)
+bool TokenList::createTokens(const std::string& file0)
 {
     ASSERT_LANG(!file0.empty());
 
     appendFileIfNew(file0);
 
-    return createTokensInternal(code, file0);
+    return createTokensInternal(file0);
 }
 
 //---------------------------------------------------------------------------
@@ -371,10 +371,10 @@ bool TokenList::createTokens(const uint8_t* data, size_t size, Standards::Langua
 
 //---------------------------------------------------------------------------
 
-bool TokenList::createTokensInternal(std::istream &code, const std::string& file0)
+bool TokenList::createTokensInternal(const std::string& file0)
 {
     simplecpp::OutputList outputList;
-    simplecpp::TokenList tokens(code, mFiles, file0, &outputList);
+    simplecpp::TokenList tokens(file0, mFiles, &outputList);
 
     createTokens(std::move(tokens));
 

diff --git a/lib/tokenlist.h b/lib/tokenlist.h
@@ -102,10 +102,9 @@ class CPPCHECKLIB TokenList {
      * - multiline strings are not handled.
      * - UTF in the code are not handled.
      * - comments are not handled.
-     * @param code input stream for code
      * @param file0 source file name
      */
-    bool createTokens(std::istream &code, const std::string& file0);
+    bool createTokens(const std::string& file0);
     bool createTokens(const uint8_t* data, size_t size, const std::string& file0);
     bool createTokens(const char* data, size_t size, const std::string& file0) {
         return createTokens(reinterpret_cast<const uint8_t*>(data), size, file0);
@@ -219,7 +218,7 @@ class CPPCHECKLIB TokenList {
 private:
     void determineCppC();
 
-    bool createTokensInternal(std::istream &code, const std::string& file0);
+    bool createTokensInternal(const std::string& file0);
     bool createTokensInternal(const uint8_t* data, std::size_t size, const std::string& file0);
 
     /** Token list */