524 wip

Author: glankk

.github/workflows/CI-mingw.yml

@@ -48,13 +48,14 @@ jobs:
           # TODO: install mingw-w64-x86_64-make and use mingw32.make instead - currently fails with "Windows Subsystem for Linux has no installed distributions."
           install: >-
             make
-            python
-            python-pytest
+            ${{ matrix.pkg-prefix }}python
+            ${{ matrix.pkg-prefix }}python-pytest
 
       - name: install compiler
         run: |
           pacman -S --noconfirm ${{ matrix.pkg-prefix }}${{ matrix.compiler-pkg }}
           ${CXX} -v
+          which python3
 
       - name: install libc++
         if: matrix.compiler == 'clang++' && matrix.pkg-prefix != ''

simplecpp.cpp

@@ -3,7 +3,7 @@
  * Copyright (C) 2016-2023 simplecpp team
  */
 
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(_WIN32)
 #  define _WIN32_WINNT 0x0602
 #  define NOMINMAX
 #  include <windows.h>
@@ -33,7 +33,7 @@
 #include <stack>
 #include <stdexcept>
 #include <string>
-#ifdef SIMPLECPP_WINDOWS
+#ifdef _WIN32
 #  include <mutex>
 #endif
 #include <unordered_map>
@@ -2415,7 +2415,7 @@ namespace simplecpp {
 #endif
 }
 
-#ifdef SIMPLECPP_WINDOWS
+#ifdef _WIN32
 static bool isAbsolutePath(const std::string &path)
 {
     if (path.length() >= 3 && path[0] > 0 && std::isalpha(path[0]) && path[1] == ':' && (path[2] == '\\' || path[2] == '/'))
@@ -2941,7 +2941,7 @@ static const simplecpp::Token *gotoNextLine(const simplecpp::Token *tok)
     return tok;
 }
 
-#ifdef SIMPLECPP_WINDOWS
+#ifdef _WIN32
 
 class NonExistingFilesCache {
 public:
@@ -2973,14 +2973,14 @@ static NonExistingFilesCache nonExistingFilesCache;
 
 static std::string openHeaderDirect(std::ifstream &f, const std::string &path)
 {
-#ifdef SIMPLECPP_WINDOWS
+#ifdef _WIN32
     if (nonExistingFilesCache.contains(path))
         return "";  // file is known not to exist, skip expensive file open call
 #endif
     f.open(path.c_str());
     if (f.is_open())
         return path;
-#ifdef SIMPLECPP_WINDOWS
+#ifdef _WIN32
     nonExistingFilesCache.add(path);
 #endif
     return "";
@@ -3082,7 +3082,7 @@ std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get(const std::
 
 bool simplecpp::FileDataCache::getFileId(const std::string &path, FileID &id)
 {
-#ifdef SIMPLECPP_WINDOWS
+#ifdef _WIN32
     HANDLE hFile = CreateFileA(path.c_str(), 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 
     if (hFile == INVALID_HANDLE_VALUE)
@@ -3108,7 +3108,7 @@ bool simplecpp::FileDataCache::getFileId(const std::string &path, FileID &id)
 
 simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens, std::vector<std::string> &filenames, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, FileDataCache cache)
 {
-#ifdef SIMPLECPP_WINDOWS
+#ifdef _WIN32
     if (dui.clearIncludeCache)
         nonExistingFilesCache.clear();
 #endif
@@ -3243,7 +3243,7 @@ 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)
 {
-#ifdef SIMPLECPP_WINDOWS
+#ifdef _WIN32
     if (dui.clearIncludeCache)
         nonExistingFilesCache.clear();
 #endif

simplecpp.h

@@ -6,10 +6,6 @@
 #ifndef simplecppH
 #define simplecppH
 
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
-#  define SIMPLECPP_WINDOWS
-#endif
-
 #include <cctype>
 #include <cstring>
 #include <iosfwd>
@@ -43,7 +39,7 @@
 #  define SIMPLECPP_LIB
 #endif
 
-#ifdef SIMPLECPP_WINDOWS
+#ifdef _WIN32
 #  include <cstdint>
 #else
 #  include <sys/stat.h>
@@ -471,7 +467,7 @@ namespace simplecpp {
 
     private:
         struct FileID {
-#ifdef SIMPLECPP_WINDOWS
+#ifdef _WIN32
             struct {
                 std::uint64_t VolumeSerialNumber;
                 struct {
@@ -495,7 +491,7 @@ namespace simplecpp {
 #endif
             struct Hasher {
                 std::size_t operator()(const FileID &id) const {
-#ifdef SIMPLECPP_WINDOWS
+#ifdef _WIN32
                     return static_cast<std::size_t>(id.fileIdInfo.FileId.IdentifierHi ^ id.fileIdInfo.FileId.IdentifierLo ^
                                                     id.fileIdInfo.VolumeSerialNumber);
 #else