Merge branch 'cppcheck-opensource:master' into chr_utf16

Author: chrchr-github

.github/workflows/CI-mingw.yml

@@ -33,6 +33,9 @@ jobs:
         exclude:
           - msystem: CLANG64
             compiler: g++
+          # the mingw-w64-i686-clang package is no longer available
+          - msystem: MINGW32
+            compiler: clang++
       fail-fast: false
 
     runs-on: windows-2025

.github/workflows/CI-unixish.yml

@@ -10,13 +10,17 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-22.04, ubuntu-24.04, macos-14, macos-15, macos-15-intel, macos-26]
+        os: [ubuntu-22.04, ubuntu-22.04-arm, ubuntu-24.04, ubuntu-24.04-arm, macos-14, macos-15, macos-15-intel, macos-26, macos-26-intel]
         compiler: [clang++]
         include:
           - os: ubuntu-22.04
             compiler: g++
+          - os: ubuntu-22.04-arm
+            compiler: g++
           - os: ubuntu-24.04
             compiler: g++
+          - os: ubuntu-24.04-arm
+            compiler: g++
       fail-fast: false
 
     runs-on: ${{ matrix.os }}

.github/workflows/CI-windows.yml

@@ -12,14 +12,21 @@ permissions:
 defaults:
   run:
     shell: cmd
-    
+
 jobs:
 
   build:
     strategy:
       matrix:
         os: [windows-2022, windows-2025, windows-11-arm]
         config: [Release, Debug]
+        include:
+        - os: windows-2022
+          sln: sln
+        - os: windows-2025
+          sln: slnx
+        - os: windows-11-arm
+          sln: sln
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -32,10 +39,10 @@ jobs:
       - name: Setup msbuild.exe
         uses: microsoft/setup-msbuild@v2
 
-      - name: Set up Python 3.13
+      - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: '3.13'
+          python-version: '3.14'
           check-latest: true
 
       - name: Install missing Python packages
@@ -45,12 +52,12 @@ jobs:
 
       - name: Run CMake
         run: |
-          cmake -G "Visual Studio 17 2022" -A x64 -Werror=dev --warn-uninitialized -DCMAKE_COMPILE_WARNING_AS_ERROR=On . || exit /b !errorlevel!
+          cmake -A x64 -Werror=dev --warn-uninitialized -DCMAKE_COMPILE_WARNING_AS_ERROR=On . || exit /b !errorlevel!
 
       - name: Build
         run: |
-           msbuild -m simplecpp.sln /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
-           
+           msbuild -m simplecpp.${{ matrix.sln }} /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
+
       - name: Test
         run: |
           .\${{ matrix.config }}\testrunner.exe || exit /b !errorlevel!
@@ -66,17 +73,17 @@ jobs:
 
       - name: Run CMake (c++17)
         run: |
-          cmake -S . -B build.cxx17 -G "Visual Studio 17 2022" -A x64 -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=17 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
+          cmake -S . -B build.cxx17 -A x64 -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=17 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
 
       - name: Build (c++17)
         run: |
-          msbuild -m build.cxx17\simplecpp.sln /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
+          msbuild -m build.cxx17\simplecpp.${{ matrix.sln }} /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
 
       - name: Run CMake (c++20)
         run: |
-          cmake -S . -B build.cxx20 -G "Visual Studio 17 2022" -A x64 -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=20 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
+          cmake -S . -B build.cxx20 -A x64 -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=20 -DCMAKE_COMPILE_WARNING_AS_ERROR=On || exit /b !errorlevel!
 
       - name: Build (c++20)
         run: |
-          msbuild -m build.cxx20\simplecpp.sln /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
+          msbuild -m build.cxx20\simplecpp.${{ matrix.sln }} /p:Configuration=${{ matrix.config }} /p:Platform=x64 || exit /b !errorlevel!
     

.github/workflows/clang-tidy.yml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Prepare CMake
         run: |
-          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+          cmake -S . -B cmake.output -Werror=dev --warn-uninitialized -DCMAKE_CXX_STANDARD=23 -DCMAKE_COMPILE_WARNING_AS_ERROR=On -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
         env:
           CXX: clang-22
 

README.md

@@ -1,5 +1,7 @@
 # Simple C/C++ preprocessor
 
+NOTE: This repository was recently moved from https://github.com/danmar/simplecpp to https://github.com/cppcheck-opensource/simplecpp. Please make sure to update all your references to it accordingly.
+
 This is a simple C/C++ preprocessor.
 
 The goal is to have good conformance with the C and C++ standards and to handle nonstandard preprocessor extensions in gcc / clang / visual studio preprocessors. Most of the preprocessor testcases in gcc and clang are handled OK by simplecpp.

main.cpp

@@ -6,12 +6,14 @@
 #define SIMPLECPP_TOKENLIST_ALLOW_PTR 0
 #include "simplecpp.h"
 
+#include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
 #include <iostream>
-#include <sys/stat.h>
+#include <sstream>
 #include <string>
+#include <sys/stat.h>
 #include <utility>
 #include <vector>
 
@@ -28,7 +30,12 @@ int main(int argc, char **argv)
 {
     bool error = false;
     const char *filename = nullptr;
-    bool use_istream = false;
+    enum : std::uint8_t {
+        File,
+        Fstream,
+        Sstream,
+        CharBuffer
+    } toklist_inf = File;
     bool fail_on_error = false;
     bool linenrs = false;
 
@@ -86,9 +93,28 @@ int main(int argc, char **argv)
                         break;
                     }
                     dui.includes.emplace_back(std::move(value));
-                } else if (std::strncmp(arg, "-is",3)==0) {
+                }
+                else if (std::strncmp(arg, "-input=",7)==0) {
                     found = true;
-                    use_istream = true;
+                    const std::string input = arg + 7;
+                    if (input.empty()) {
+                        std::cout << "error: option -input with no value." << std::endl;
+                        error = true;
+                        break;
+                    }
+                    if (input == "file") {
+                        toklist_inf = File;
+                    } else if (input == "fstream") {
+                        toklist_inf = Fstream;
+                    } else if (input == "sstream") {
+                        toklist_inf = Sstream;
+                    } else if (input == "buffer") {
+                        toklist_inf = CharBuffer;
+                    } else {
+                        std::cout << "error: unknown input type '" << input << "'." << std::endl;
+                        error = true;
+                        break;
+                    }
                 }
                 break;
             case 's':
@@ -104,20 +130,28 @@ int main(int argc, char **argv)
                 }
                 break;
             case 'q':
-                found = true;
-                quiet = true;
+                if (std::strcmp(arg, "-q")==0) {
+                    found = true;
+                    quiet = true;
+                }
                 break;
             case 'e':
-                found = true;
-                error_only = true;
+                if (std::strcmp(arg, "-e")==0) {
+                    found = true;
+                    error_only = true;
+                }
                 break;
             case 'f':
-                found = true;
-                fail_on_error = true;
+                if (std::strcmp(arg, "-f")==0) {
+                    fail_on_error = true;
+                    found = true;
+                }
                 break;
             case 'l':
-                linenrs = true;
-                found = true;
+                if (std::strcmp(arg, "-l")==0) {
+                    linenrs = true;
+                    found = true;
+                }
                 break;
             }
             if (!found) {
@@ -149,7 +183,7 @@ int main(int argc, char **argv)
         std::cout << "  -UNAME          Undefine NAME." << std::endl;
         std::cout << "  -std=STD        Specify standard." << std::endl;
         std::cout << "  -q              Quiet mode (no output)." << std::endl;
-        std::cout << "  -is             Use std::istream interface." << std::endl;
+        std::cout << "  -input=INPUT    Specify input type - file (default), fstream, sstream, buffer." << std::endl;
         std::cout << "  -e              Output errors only." << std::endl;
         std::cout << "  -f              Fail when errors were encountered (exitcode 1)." << std::endl;
         std::cout << "  -l              Print lines numbers." << std::endl;
@@ -189,8 +223,21 @@ int main(int argc, char **argv)
     simplecpp::TokenList outputTokens(files);
     {
         simplecpp::TokenList *rawtokens;
-        if (use_istream) {
-            rawtokens = new simplecpp::TokenList(f, files,filename,&outputList);
+        if (toklist_inf == Fstream) {
+            rawtokens = new simplecpp::TokenList(f,files,filename,&outputList);
+        }
+        else if (toklist_inf == Sstream || toklist_inf == CharBuffer) {
+            std::ostringstream oss;
+            oss << f.rdbuf();
+            f.close();
+            const std::string s = oss.str();
+            if (toklist_inf == Sstream) {
+                std::istringstream iss(s);
+                rawtokens = new simplecpp::TokenList(iss,files,filename,&outputList);
+            }
+            else {
+                rawtokens = new simplecpp::TokenList({s.data(),s.size()},files,filename,&outputList);
+            }
         } else {
             f.close();
             rawtokens = new simplecpp::TokenList(filename,files,&outputList);

simplecpp.cpp

@@ -638,10 +638,10 @@ static bool isStringLiteralPrefix(const std::string &str)
            str == "R" || str == "uR" || str == "UR" || str == "LR" || str == "u8R";
 }
 
-void simplecpp::TokenList::lineDirective(unsigned int fileIndex, unsigned int line, Location &location)
+void simplecpp::TokenList::lineDirective(unsigned int fileIndex_, unsigned int line, Location &location)
 {
-    if (fileIndex != location.fileIndex || line >= location.line) {
-        location.fileIndex = fileIndex;
+    if (fileIndex_ != location.fileIndex || line >= location.line) {
+        location.fileIndex = fileIndex_;
         location.line = line;
         return;
     }
@@ -1742,6 +1742,9 @@ namespace simplecpp {
             return tok;
         }
 
+        /**
+         * @throws Error thrown in case of __VA_OPT__ issues
+         */
         bool parseDefine(const Token *nametoken) {
             nameTokDef = nametoken;
             variadic = false;
@@ -2204,6 +2207,8 @@ namespace simplecpp {
             }
 
             output.push_back(newMacroToken(tok->str(), loc, true, tok));
+            if (it != macros.end())
+                output.back()->markExpandedFrom(&it->second);
             return tok->next;
         }
 
@@ -3382,6 +3387,17 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
             }
             output.clear();
             return;
+        } catch (const simplecpp::Macro::Error& e) {
+            if (outputList) {
+                simplecpp::Output err{
+                    Output::DUI_ERROR,
+                    {},
+                    e.what
+                };
+                outputList->emplace_back(std::move(err));
+            }
+            output.clear();
+            return;
         }
     }
 
@@ -3510,14 +3526,14 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         else
                             it->second = macro;
                     }
-                } catch (const std::runtime_error &) {
+                } catch (const std::runtime_error &err) {
                     if (outputList) {
-                        simplecpp::Output err{
+                        simplecpp::Output out{
                             Output::SYNTAX_ERROR,
                             rawtok->location,
-                            "Failed to parse #define"
+                            std::string("Failed to parse #define, ") + err.what()
                         };
-                        outputList->emplace_back(std::move(err));
+                        outputList->emplace_back(std::move(out));
                     }
                     output.clear();
                     return;

simplecpp.h

@@ -83,7 +83,7 @@ namespace simplecpp {
             , mSize(strlen(data))
         {}
 
-        // only provide when std::span is not available so using untyped initilization won't use View
+        // only provide when std::span is not available so using untyped initialization won't use View
 #if !defined(__cpp_lib_span)
         View(const char* data, std::size_t size)
             : mData(data)
@@ -174,9 +174,9 @@ namespace simplecpp {
         bool isOneOf(const char ops[]) const;
         bool startsWithOneOf(const char c[]) const;
         bool endsWithOneOf(const char c[]) const;
-        static bool isNumberLike(const std::string& str) {
-            return std::isdigit(static_cast<unsigned char>(str[0])) ||
-                   (str.size() > 1U && (str[0] == '-' || str[0] == '+') && std::isdigit(static_cast<unsigned char>(str[1])));
+        static bool isNumberLike(const std::string& s) {
+            return std::isdigit(static_cast<unsigned char>(s[0])) ||
+                   (s.size() > 1U && (s[0] == '-' || s[0] == '+') && std::isdigit(static_cast<unsigned char>(s[1])));
         }
 
         TokenString macro;
@@ -213,6 +213,9 @@ namespace simplecpp {
         bool isExpandedFrom(const Macro* m) const {
             return mExpandedFrom.find(m) != mExpandedFrom.end();
         }
+        void markExpandedFrom(const Macro* m) {
+            mExpandedFrom.insert(m);
+        }
 
         void printAll() const;
         void printOut() const;
@@ -376,7 +379,7 @@ namespace simplecpp {
         const std::string& file(const Location& loc) const;
 
     private:
-        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList, int unused);
+        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList, int /*unused*/);
 
         void combineOperators();
 
@@ -396,7 +399,7 @@ namespace simplecpp {
         void constFoldQuestionOp(Token *&tok1);
 
         std::string readUntil(Stream &stream, const Location &location, char start, char end, OutputList *outputList);
-        void lineDirective(unsigned int fileIndex, unsigned int line, Location &location);
+        void lineDirective(unsigned int fileIndex_, unsigned int line, Location &location);
 
         const Token* lastLineTok(int maxsize=1000) const;
         const Token* isLastLinePreprocessor(int maxsize=1000) const;