test

Author: glankk

.github/workflows/CI-unixish.yml

@@ -15,8 +15,8 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [windows-2022, windows-2025]
-        config: [Release, Debug]
+        os: [windows-2025]
+        config: [Debug]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}

.github/workflows/CI-windows.yml

@@ -128,16 +128,21 @@ int main(int argc, char **argv)
     rawtokens->removeComments();
     simplecpp::TokenList outputTokens(files);
     simplecpp::FileDataCache filedata;
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
     simplecpp::preprocess(outputTokens, *rawtokens, files, filedata, dui, &outputList);
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
     simplecpp::cleanup(filedata);
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
     delete rawtokens;
     rawtokens = nullptr;
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
 
     // Output
     if (!quiet) {
         if (!error_only)
             std::cout << outputTokens.stringify() << std::endl;
 
+        std::cout << __FILE__ << ":" << __LINE__ << std::endl;
         for (const simplecpp::Output &output : outputList) {
             std::cerr << output.location.file() << ':' << output.location.line << ": ";
             switch (output.type) {
@@ -176,6 +181,7 @@ int main(int argc, char **argv)
         }
     }
 
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
     if (fail_on_error && !outputList.empty())
         return 1;
 

.github/workflows/clang-tidy.yml

@@ -547,11 +547,11 @@ simplecpp::TokenList &simplecpp::TokenList::operator=(TokenList &&other)
 void simplecpp::TokenList::clear()
 {
     backToken = nullptr;
-    while (frontToken) {
-        Token * const next = frontToken->next;
-        delete frontToken;
-        frontToken = next;
-    }
+    // while (frontToken) {
+    //     Token * const next = frontToken->next;
+    //     delete frontToken;
+    //     frontToken = next;
+    // }
     sizeOfType.clear();
 }
 
@@ -3088,8 +3088,9 @@ simplecpp::FileData *simplecpp::FileDataCache::lookup(const std::string &sourcef
             return nullptr;
     }
 
-    for (std::list<std::string>::const_iterator it = dui.includePaths.begin(); it != dui.includePaths.end(); ++it) {
-        const std::string path = getIncludePathFileName(*it, header);
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
+    for (const auto &includePath : dui.includePaths) {
+        const std::string path = getIncludePathFileName(includePath, header);
         const auto name_it = mNameMap.find(path);
 
         if (name_it != mNameMap.end())
@@ -3133,11 +3134,14 @@ std::pair<bool, simplecpp::FileData *> simplecpp::FileDataCache::load(const std:
 
 std::pair<bool, simplecpp::FileData *> simplecpp::FileDataCache::get(const std::string &sourcefile, const std::string &header, const simplecpp::DUI &dui, bool systemheader, std::vector<std::string> &filenames, simplecpp::OutputList *outputList)
 {
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
     FileData *const data = lookup(sourcefile, header, dui, systemheader);
 
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
     if (data != nullptr)
         return std::make_pair(false, data);
 
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
     return load(sourcefile, header, dui, systemheader, filenames, outputList);
 }
 
@@ -3309,11 +3313,13 @@ static std::string getTimeDefine(const struct tm *timep)
 
 void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenList &rawtokens, std::vector<std::string> &files, simplecpp::FileDataCache &cache, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage, std::list<simplecpp::IfCond> *ifCond)
 {
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
 #ifdef SIMPLECPP_WINDOWS
     if (dui.clearIncludeCache)
         nonExistingFilesCache.clear();
 #endif
-
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
+    
     std::map<std::string, std::size_t> sizeOfType(rawtokens.sizeOfType);
     sizeOfType.insert(std::make_pair("char", sizeof(char)));
     sizeOfType.insert(std::make_pair("short", sizeof(short)));
@@ -3404,6 +3410,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
             includetokenstack.push(filedata->tokens.cfront());
     }
 
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
     std::map<std::string, std::list<Location> > maybeUsedMacros;
 
     for (const Token *rawtok = nullptr; rawtok || !includetokenstack.empty();) {
@@ -3519,11 +3526,13 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                     return;
                 }
 
+                std::cout << __FILE__ << ":" << __LINE__ << std::endl;
                 const Token * const inctok = inc2.cfront();
 
                 const bool systemheader = (inctok->str()[0] == '<');
                 const std::string header(inctok->str().substr(1U, inctok->str().size() - 2U));
                 const FileData *const filedata = cache.get(rawtok->location.file(), header, dui, systemheader, files, outputList).second;
+                std::cout << __FILE__ << ":" << __LINE__ << std::endl;
                 if (filedata == nullptr) {
                     if (outputList) {
                         simplecpp::Output out(files);
@@ -3752,6 +3761,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
             output.takeTokens(tokens);
         }
     }
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
 
     if (macroUsage) {
         for (simplecpp::MacroMap::const_iterator macroIt = macros.begin(); macroIt != macros.end(); ++macroIt) {

main.cpp

@@ -9,6 +9,7 @@
 #include <cctype>
 #include <cstring>
 #include <iosfwd>
+#include <iostream>
 #include <list>
 #include <map>
 #include <memory>
@@ -424,9 +425,13 @@ namespace simplecpp {
         }
 
         void clear() {
+            std::cout << __FILE__ << ":" << __LINE__ << std::endl;
             mNameMap.clear();
+            std::cout << __FILE__ << ":" << __LINE__ << std::endl;
             mIdMap.clear();
+            std::cout << __FILE__ << ":" << __LINE__ << std::endl;
             mData.clear();
+            std::cout << __FILE__ << ":" << __LINE__ << std::endl;
         }
 
         typedef std::vector<std::unique_ptr<FileData>> container_type;