From 97db8175208f8f4a103ae21a3b20f2dc7981fe02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?=
 <daniel.marjamaki@cppchecksolutions.com>
Date: Thu, 30 Oct 2025 16:21:37 +0100
Subject: [PATCH] Revert "fixed #14179 - updated simplecpp to 1.6.1 / hooked up
 `simplecpp::C2Y` (#7860)"

This reverts commit cd9d2dea969aa54a72be7b4d234c91814d9a9936.
---
 externals/simplecpp/simplecpp.cpp | 356 +++++++++++++-----------------
 externals/simplecpp/simplecpp.h   | 128 +++--------
 gui/mainwindow.cpp                |   4 -
 gui/mainwindow.ui                 |   9 -
 lib/keywords.cpp                  |  11 -
 lib/standards.cpp                 |   4 -
 lib/standards.h                   |   2 +-
 7 files changed, 191 insertions(+), 323 deletions(-)
 mode change 100644 => 100755 externals/simplecpp/simplecpp.cpp
 mode change 100644 => 100755 externals/simplecpp/simplecpp.h

diff --git a/externals/simplecpp/simplecpp.cpp b/externals/simplecpp/simplecpp.cpp
old mode 100644
new mode 100755
index 9f7de67dae2..fd3275499a3
--- a/externals/simplecpp/simplecpp.cpp
+++ b/externals/simplecpp/simplecpp.cpp
@@ -3,32 +3,20 @@
  * Copyright (C) 2016-2023 simplecpp team
  */
 
-#if defined(_WIN32)
-#  ifndef _WIN32_WINNT
-#    define _WIN32_WINNT 0x0602
-#  endif
-#  ifndef NOMINMAX
-#    define NOMINMAX
-#  endif
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+#  define _WIN32_WINNT 0x0602
+#  define NOMINMAX
 #  include <windows.h>
 #  undef ERROR
 #endif
 
 #include "simplecpp.h"
 
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
-#  define SIMPLECPP_WINDOWS
-#endif
-
 #include <algorithm>
 #include <cassert>
 #include <cctype>
 #include <climits>
 #include <cstddef> // IWYU pragma: keep
-#include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -363,16 +351,16 @@ class StdIStream : public simplecpp::TokenList::Stream {
         init();
     }
 
-    int get() override {
+    virtual int get() override {
         return istr.get();
     }
-    int peek() override {
+    virtual int peek() override {
         return istr.peek();
     }
-    void unget() override {
+    virtual void unget() override {
         istr.unget();
     }
-    bool good() override {
+    virtual bool good() override {
         return istr.good();
     }
 
@@ -391,20 +379,20 @@ class StdCharBufStream : public simplecpp::TokenList::Stream {
         init();
     }
 
-    int get() override {
+    virtual int get() override {
         if (pos >= size)
             return lastStatus = EOF;
         return str[pos++];
     }
-    int peek() override {
+    virtual int peek() override {
         if (pos >= size)
             return lastStatus = EOF;
         return str[pos];
     }
-    void unget() override {
+    virtual void unget() override {
         --pos;
     }
-    bool good() override {
+    virtual bool good() override {
         return lastStatus != EOF;
     }
 
@@ -434,20 +422,20 @@ class FileStream : public simplecpp::TokenList::Stream {
         file = nullptr;
     }
 
-    int get() override {
+    virtual int get() override {
         lastStatus = lastCh = fgetc(file);
         return lastCh;
     }
-    int peek() override {
+    virtual int peek() override {
         // keep lastCh intact
         const int ch = fgetc(file);
         unget_internal(ch);
         return ch;
     }
-    void unget() override {
+    virtual void unget() override {
         unget_internal(lastCh);
     }
-    bool good() override {
+    virtual bool good() override {
         return lastStatus != EOF;
     }
 
@@ -478,13 +466,20 @@ simplecpp::TokenList::TokenList(std::istream &istr, std::vector<std::string> &fi
     readfile(stream,filename,outputList);
 }
 
-simplecpp::TokenList::TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList, int /*unused*/)
+simplecpp::TokenList::TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList)
     : frontToken(nullptr), backToken(nullptr), files(filenames)
 {
     StdCharBufStream stream(data, size);
     readfile(stream,filename,outputList);
 }
 
+simplecpp::TokenList::TokenList(const char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList)
+    : frontToken(nullptr), backToken(nullptr), files(filenames)
+{
+    StdCharBufStream stream(reinterpret_cast<const unsigned char*>(data), size);
+    readfile(stream,filename,outputList);
+}
+
 simplecpp::TokenList::TokenList(const std::string &filename, std::vector<std::string> &filenames, OutputList *outputList)
     : frontToken(nullptr), backToken(nullptr), files(filenames)
 {
@@ -558,33 +553,24 @@ void simplecpp::TokenList::push_back(Token *tok)
     backToken = tok;
 }
 
-void simplecpp::TokenList::dump(bool linenrs) const
+void simplecpp::TokenList::dump() const
 {
-    std::cout << stringify(linenrs) << std::endl;
+    std::cout << stringify() << std::endl;
 }
 
-std::string simplecpp::TokenList::stringify(bool linenrs) const
+std::string simplecpp::TokenList::stringify() const
 {
     std::ostringstream ret;
     Location loc(files);
-    bool filechg = true;
     for (const Token *tok = cfront(); tok; tok = tok->next) {
         if (tok->location.line < loc.line || tok->location.fileIndex != loc.fileIndex) {
             ret << "\n#line " << tok->location.line << " \"" << tok->location.file() << "\"\n";
             loc = tok->location;
-            filechg = true;
-        }
-
-        if (linenrs && filechg) {
-            ret << loc.line << ": ";
-            filechg = false;
         }
 
         while (tok->location.line > loc.line) {
             ret << '\n';
             loc.line++;
-            if (linenrs)
-                ret << loc.line << ": ";
         }
 
         if (sameline(tok->previous, tok))
@@ -625,7 +611,7 @@ static void portabilityBackslash(simplecpp::OutputList *outputList, const std::v
     err.type = simplecpp::Output::PORTABILITY_BACKSLASH;
     err.location = location;
     err.msg = "Combination 'backslash space newline' is not portable.";
-    outputList->push_back(std::move(err));
+    outputList->push_back(err);
 }
 
 static bool isStringLiteralPrefix(const std::string &str)
@@ -775,18 +761,18 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
             while (stream.good() && ch != '\n') {
                 currentToken += ch;
                 ch = stream.readChar();
-                if (ch == '\\') {
+                if(ch == '\\') {
                     TokenString tmp;
                     char tmp_ch = ch;
-                    while ((stream.good()) && (tmp_ch == '\\' || tmp_ch == ' ' || tmp_ch == '\t')) {
+                    while((stream.good()) && (tmp_ch == '\\' || tmp_ch == ' ' || tmp_ch == '\t')) {
                         tmp += tmp_ch;
                         tmp_ch = stream.readChar();
                     }
-                    if (!stream.good()) {
+                    if(!stream.good()) {
                         break;
                     }
 
-                    if (tmp_ch != '\n') {
+                    if(tmp_ch != '\n') {
                         currentToken += tmp;
                     } else {
                         const TokenString check_portability = currentToken + tmp;
@@ -869,7 +855,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                         err.type = Output::SYNTAX_ERROR;
                         err.location = location;
                         err.msg = "Raw string missing terminating delimiter.";
-                        outputList->push_back(std::move(err));
+                        outputList->push_back(err);
                     }
                     return;
                 }
@@ -879,7 +865,7 @@ void simplecpp::TokenList::readfile(Stream &stream, const std::string &filename,
                 back()->setstr(currentToken);
                 location.adjust(currentToken);
                 if (currentToken.find_first_of("\r\n") == std::string::npos)
-                    location.col += 2 + (2 * delim.size());
+                    location.col += 2 + 2 * delim.size();
                 else
                     location.col += 1 + delim.size();
 
@@ -1334,7 +1320,6 @@ void simplecpp::TokenList::constFoldLogicalOp(Token *tok)
 void simplecpp::TokenList::constFoldQuestionOp(Token **tok1)
 {
     bool gotoTok1 = false;
-    // NOLINTNEXTLINE(misc-const-correctness) - technically correct but used to access non-const data
     for (Token *tok = *tok1; tok && tok->op != ')'; tok =  gotoTok1 ? *tok1 : tok->next) {
         gotoTok1 = false;
         if (tok->str() != "?")
@@ -1412,7 +1397,7 @@ std::string simplecpp::TokenList::readUntil(Stream &stream, const Location &loca
             err.type = Output::SYNTAX_ERROR;
             err.location = location;
             err.msg = std::string("No pair for character (") + start + "). Can't process file. File is either invalid or unicode, which is currently not supported.";
-            outputList->push_back(std::move(err));
+            outputList->push_back(err);
         }
         return "";
     }
@@ -1514,12 +1499,7 @@ namespace simplecpp {
         }
 
         Macro(const Macro &other) : nameTokDef(nullptr), files(other.files), tokenListDefine(other.files), valueDefinedInCode_(other.valueDefinedInCode_) {
-            // TODO: remove the try-catch - see #537
-            // avoid bugprone-exception-escape clang-tidy warning
-            try {
-                *this = other;
-            }
-            catch (const Error&) {} // NOLINT(bugprone-empty-catch)
+            *this = other;
         }
 
         ~Macro() {
@@ -1555,7 +1535,7 @@ namespace simplecpp {
          * @return token after macro
          * @throw Can throw wrongNumberOfParameters or invalidHashHash
          */
-        const Token * expand(TokenList & output,
+        const Token * expand(TokenList * const output,
                              const Token * rawtok,
                              const MacroMap &macros,
                              std::vector<std::string> &inputFiles) const {
@@ -1586,10 +1566,10 @@ namespace simplecpp {
                     rawtokens2.push_back(new Token(rawtok->str(), rawtok1->location, rawtok->whitespaceahead));
                     rawtok = rawtok->next;
                 }
-                if (expand(output2, rawtok1->location, rawtokens2.cfront(), macros, expandedmacros))
+                if (expand(&output2, rawtok1->location, rawtokens2.cfront(), macros, expandedmacros))
                     rawtok = rawtok1->next;
             } else {
-                rawtok = expand(output2, rawtok->location, rawtok, macros, expandedmacros);
+                rawtok = expand(&output2, rawtok->location, rawtok, macros, expandedmacros);
             }
             while (output2.cback() && rawtok) {
                 unsigned int par = 0;
@@ -1637,11 +1617,11 @@ namespace simplecpp {
                 }
                 if (!rawtok2 || par != 1U)
                     break;
-                if (macro->second.expand(output2, rawtok->location, rawtokens2.cfront(), macros, expandedmacros) != nullptr)
+                if (macro->second.expand(&output2, rawtok->location, rawtokens2.cfront(), macros, expandedmacros) != nullptr)
                     break;
                 rawtok = rawtok2->next;
             }
-            output.takeTokens(output2);
+            output->takeTokens(output2);
             return rawtok;
         }
 
@@ -1687,7 +1667,7 @@ namespace simplecpp {
             }
 
             invalidHashHash(const Location &loc, const std::string &macroName, const std::string &message)
-                : Error(loc, format(macroName, message)) {}
+                : Error(loc, format(macroName, message)) { }
 
             static inline invalidHashHash unexpectedToken(const Location &loc, const std::string &macroName, const Token *tokenA) {
                 return invalidHashHash(loc, macroName, "Unexpected token '"+ tokenA->str()+"'");
@@ -1720,9 +1700,7 @@ namespace simplecpp {
             nameTokDef = nametoken;
             variadic = false;
             variadicOpt = false;
-            delete optExpandValue;
             optExpandValue = nullptr;
-            delete optNoExpandValue;
             optNoExpandValue = nullptr;
             if (!nameTokDef) {
                 valueToken = endToken = nullptr;
@@ -1739,7 +1717,7 @@ namespace simplecpp {
                         argtok->next && argtok->next->op == ')') {
                         variadic = true;
                         if (!argtok->previous->name)
-                            args.emplace_back("__VA_ARGS__");
+                            args.push_back("__VA_ARGS__");
                         argtok = argtok->next; // goto ')'
                         break;
                     }
@@ -1839,7 +1817,7 @@ namespace simplecpp {
             return parametertokens;
         }
 
-        const Token *appendTokens(TokenList &tokens,
+        const Token *appendTokens(TokenList *tokens,
                                   const Location &rawloc,
                                   const Token * const lpar,
                                   const MacroMap &macros,
@@ -1857,9 +1835,9 @@ namespace simplecpp {
                     tok = expandHash(tokens, rawloc, tok, expandedmacros, parametertokens);
                 } else {
                     if (!expandArg(tokens, tok, rawloc, macros, expandedmacros, parametertokens)) {
-                        tokens.push_back(new Token(*tok));
+                        tokens->push_back(new Token(*tok));
                         if (tok->macro.empty() && (par > 0 || tok->str() != "("))
-                            tokens.back()->macro = name();
+                            tokens->back()->macro = name();
                     }
 
                     if (tok->op == '(')
@@ -1872,12 +1850,12 @@ namespace simplecpp {
                     tok = tok->next;
                 }
             }
-            for (Token *tok2 = tokens.front(); tok2; tok2 = tok2->next)
+            for (Token *tok2 = tokens->front(); tok2; tok2 = tok2->next)
                 tok2->location = lpar->location;
             return sameline(lpar,tok) ? tok : nullptr;
         }
 
-        const Token * expand(TokenList & output, const Location &loc, const Token * const nameTokInst, const MacroMap &macros, std::set<TokenString> expandedmacros) const {
+        const Token * expand(TokenList * const output, const Location &loc, const Token * const nameTokInst, const MacroMap &macros, std::set<TokenString> expandedmacros) const {
             expandedmacros.insert(nameTokInst->str());
 
 #ifdef SIMPLECPP_DEBUG_MACRO_EXPANSION
@@ -1887,15 +1865,15 @@ namespace simplecpp {
             usageList.push_back(loc);
 
             if (nameTokInst->str() == "__FILE__") {
-                output.push_back(new Token('\"'+loc.file()+'\"', loc));
+                output->push_back(new Token('\"'+loc.file()+'\"', loc));
                 return nameTokInst->next;
             }
             if (nameTokInst->str() == "__LINE__") {
-                output.push_back(new Token(toString(loc.line), loc));
+                output->push_back(new Token(toString(loc.line), loc));
                 return nameTokInst->next;
             }
             if (nameTokInst->str() == "__COUNTER__") {
-                output.push_back(new Token(toString(usageList.size()-1U), loc));
+                output->push_back(new Token(toString(usageList.size()-1U), loc));
                 return nameTokInst->next;
             }
 
@@ -1907,7 +1885,7 @@ namespace simplecpp {
             if (functionLike()) {
                 // No arguments => not macro expansion
                 if (nameTokInst->next && nameTokInst->next->op != '(') {
-                    output.push_back(new Token(nameTokInst->str(), loc));
+                    output->push_back(new Token(nameTokInst->str(), loc));
                     return nameTokInst->next;
                 }
 
@@ -1956,8 +1934,7 @@ namespace simplecpp {
                 }
             }
 
-            // NOLINTNEXTLINE(misc-const-correctness) - technically correct but used to access non-const data
-            Token * const output_end_1 = output.back();
+            Token * const output_end_1 = output->back();
 
             const Token *valueToken2;
             const Token *endToken2;
@@ -1982,20 +1959,20 @@ namespace simplecpp {
                             throw invalidHashHash::unexpectedNewline(tok->location, name());
                         if (variadic && tok->op == ',' && tok->next->next->next->str() == args.back()) {
                             Token *const comma = newMacroToken(tok->str(), loc, isReplaced(expandedmacros), tok);
-                            output.push_back(comma);
+                            output->push_back(comma);
                             tok = expandToken(output, loc, tok->next->next->next, macros, expandedmacros, parametertokens2);
-                            if (output.back() == comma)
-                                output.deleteToken(comma);
+                            if (output->back() == comma)
+                                output->deleteToken(comma);
                             continue;
                         }
                         TokenList new_output(files);
-                        if (!expandArg(new_output, tok, parametertokens2))
-                            output.push_back(newMacroToken(tok->str(), loc, isReplaced(expandedmacros), tok));
+                        if (!expandArg(&new_output, tok, parametertokens2))
+                            output->push_back(newMacroToken(tok->str(), loc, isReplaced(expandedmacros), tok));
                         else if (new_output.empty()) // placemarker token
-                            output.push_back(newMacroToken("", loc, isReplaced(expandedmacros)));
+                            output->push_back(newMacroToken("", loc, isReplaced(expandedmacros)));
                         else
                             for (const Token *tok2 = new_output.cfront(); tok2; tok2 = tok2->next)
-                                output.push_back(newMacroToken(tok2->str(), loc, isReplaced(expandedmacros), tok2));
+                                output->push_back(newMacroToken(tok2->str(), loc, isReplaced(expandedmacros), tok2));
                         tok = tok->next;
                     } else {
                         tok = expandToken(output, loc, tok, macros, expandedmacros, parametertokens2);
@@ -2011,26 +1988,20 @@ namespace simplecpp {
                 }
                 if (numberOfHash == 4 && tok->next->location.col + 1 == tok->next->next->location.col) {
                     // # ## #  => ##
-                    output.push_back(newMacroToken("##", loc, isReplaced(expandedmacros)));
+                    output->push_back(newMacroToken("##", loc, isReplaced(expandedmacros)));
                     tok = hashToken;
                     continue;
                 }
 
                 if (numberOfHash >= 2 && tok->location.col + 1 < tok->next->location.col) {
-                    output.push_back(new Token(*tok));
+                    output->push_back(new Token(*tok));
                     tok = tok->next;
                     continue;
                 }
 
                 tok = tok->next;
                 if (tok == endToken2) {
-                    if (tok) {
-                        output.push_back(new Token(*tok->previous));
-                    }
-                    else {
-                        output.push_back(new Token(*nameTokInst));
-                        output.back()->setstr("\"\"");
-                    }
+                    output->push_back(new Token(*tok->previous));
                     break;
                 }
                 if (tok->op == '#') {
@@ -2043,7 +2014,7 @@ namespace simplecpp {
             }
 
             if (!functionLike()) {
-                for (Token *tok = output_end_1 ? output_end_1->next : output.front(); tok; tok = tok->next) {
+                for (Token *tok = output_end_1 ? output_end_1->next : output->front(); tok; tok = tok->next) {
                     tok->macro = nameTokInst->str();
                 }
             }
@@ -2054,55 +2025,55 @@ namespace simplecpp {
             return functionLike() ? parametertokens2.back()->next : nameTokInst->next;
         }
 
-        const Token *recursiveExpandToken(TokenList &output, TokenList &temp, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
+        const Token *recursiveExpandToken(TokenList *output, TokenList &temp, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
             if (!(temp.cback() && temp.cback()->name && tok->next && tok->next->op == '(')) {
-                output.takeTokens(temp);
+                output->takeTokens(temp);
                 return tok->next;
             }
 
             if (!sameline(tok, tok->next)) {
-                output.takeTokens(temp);
+                output->takeTokens(temp);
                 return tok->next;
             }
 
             const MacroMap::const_iterator it = macros.find(temp.cback()->str());
             if (it == macros.end() || expandedmacros.find(temp.cback()->str()) != expandedmacros.end()) {
-                output.takeTokens(temp);
+                output->takeTokens(temp);
                 return tok->next;
             }
 
             const Macro &calledMacro = it->second;
             if (!calledMacro.functionLike()) {
-                output.takeTokens(temp);
+                output->takeTokens(temp);
                 return tok->next;
             }
 
             TokenList temp2(files);
             temp2.push_back(new Token(temp.cback()->str(), tok->location));
 
-            const Token * const tok2 = appendTokens(temp2, loc, tok->next, macros, expandedmacros, parametertokens);
+            const Token * const tok2 = appendTokens(&temp2, loc, tok->next, macros, expandedmacros, parametertokens);
             if (!tok2)
                 return tok->next;
-            output.takeTokens(temp);
-            output.deleteToken(output.back());
+            output->takeTokens(temp);
+            output->deleteToken(output->back());
             calledMacro.expand(output, loc, temp2.cfront(), macros, expandedmacros);
             return tok2->next;
         }
 
-        const Token *expandToken(TokenList &output, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
+        const Token *expandToken(TokenList *output, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
             // Not name..
             if (!tok->name) {
-                output.push_back(newMacroToken(tok->str(), loc, true, tok));
+                output->push_back(newMacroToken(tok->str(), loc, true, tok));
                 return tok->next;
             }
 
             // Macro parameter..
             {
                 TokenList temp(files);
-                if (expandArg(temp, tok, loc, macros, expandedmacros, parametertokens)) {
-                    if (tok->str() == "__VA_ARGS__" && temp.empty() && output.cback() && output.cback()->str() == "," &&
+                if (expandArg(&temp, tok, loc, macros, expandedmacros, parametertokens)) {
+                    if (tok->str() == "__VA_ARGS__" && temp.empty() && output->cback() && output->cback()->str() == "," &&
                         tok->nextSkipComments() && tok->nextSkipComments()->str() == ")")
-                        output.deleteToken(output.back());
+                        output->deleteToken(output->back());
                     return recursiveExpandToken(output, temp, loc, tok, macros, expandedmacros, parametertokens);
                 }
             }
@@ -2116,29 +2087,29 @@ namespace simplecpp {
                 const Macro &calledMacro = it->second;
                 if (!calledMacro.functionLike()) {
                     TokenList temp(files);
-                    calledMacro.expand(temp, loc, tok, macros, expandedmacros);
+                    calledMacro.expand(&temp, loc, tok, macros, expandedmacros);
                     return recursiveExpandToken(output, temp, loc, tok, macros, expandedmacros2, parametertokens);
                 }
                 if (!sameline(tok, tok->next)) {
-                    output.push_back(newMacroToken(tok->str(), loc, true, tok));
+                    output->push_back(newMacroToken(tok->str(), loc, true, tok));
                     return tok->next;
                 }
                 TokenList tokens(files);
                 tokens.push_back(new Token(*tok));
                 const Token * tok2 = nullptr;
                 if (tok->next->op == '(')
-                    tok2 = appendTokens(tokens, loc, tok->next, macros, expandedmacros, parametertokens);
-                else if (expandArg(tokens, tok->next, loc, macros, expandedmacros, parametertokens)) {
+                    tok2 = appendTokens(&tokens, loc, tok->next, macros, expandedmacros, parametertokens);
+                else if (expandArg(&tokens, tok->next, loc, macros, expandedmacros, parametertokens)) {
                     tokens.front()->location = loc;
                     if (tokens.cfront()->next && tokens.cfront()->next->op == '(')
                         tok2 = tok->next;
                 }
                 if (!tok2) {
-                    output.push_back(newMacroToken(tok->str(), loc, true, tok));
+                    output->push_back(newMacroToken(tok->str(), loc, true, tok));
                     return tok->next;
                 }
                 TokenList temp(files);
-                calledMacro.expand(temp, loc, tokens.cfront(), macros, expandedmacros);
+                calledMacro.expand(&temp, loc, tokens.cfront(), macros, expandedmacros);
                 return recursiveExpandToken(output, temp, loc, tok2, macros, expandedmacros, parametertokens);
             }
 
@@ -2158,25 +2129,25 @@ namespace simplecpp {
                     std::string macroName = defToken->str();
                     if (defToken->next && defToken->next->op == '#' && defToken->next->next && defToken->next->next->op == '#' && defToken->next->next->next && defToken->next->next->next->name && sameline(defToken,defToken->next->next->next)) {
                         TokenList temp(files);
-                        if (expandArg(temp, defToken, parametertokens))
+                        if (expandArg(&temp, defToken, parametertokens))
                             macroName = temp.cback()->str();
-                        if (expandArg(temp, defToken->next->next->next, parametertokens))
+                        if (expandArg(&temp, defToken->next->next->next, parametertokens))
                             macroName += temp.cback() ? temp.cback()->str() : "";
                         else
                             macroName += defToken->next->next->next->str();
                         lastToken = defToken->next->next->next;
                     }
                     const bool def = (macros.find(macroName) != macros.end());
-                    output.push_back(newMacroToken(def ? "1" : "0", loc, true));
+                    output->push_back(newMacroToken(def ? "1" : "0", loc, true));
                     return lastToken->next;
                 }
             }
 
-            output.push_back(newMacroToken(tok->str(), loc, true, tok));
+            output->push_back(newMacroToken(tok->str(), loc, true, tok));
             return tok->next;
         }
 
-        bool expandArg(TokenList &output, const Token *tok, const std::vector<const Token*> &parametertokens) const {
+        bool expandArg(TokenList *output, const Token *tok, const std::vector<const Token*> &parametertokens) const {
             if (!tok->name)
                 return false;
 
@@ -2189,12 +2160,12 @@ namespace simplecpp {
                 return true;
 
             for (const Token *partok = parametertokens[argnr]->next; partok != parametertokens[argnr + 1U]; partok = partok->next)
-                output.push_back(new Token(*partok));
+                output->push_back(new Token(*partok));
 
             return true;
         }
 
-        bool expandArg(TokenList &output, const Token *tok, const Location &loc, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
+        bool expandArg(TokenList *output, const Token *tok, const Location &loc, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
             if (!tok->name)
                 return false;
             const unsigned int argnr = getArgNum(tok->str());
@@ -2207,15 +2178,15 @@ namespace simplecpp {
                 if (it != macros.end() && !partok->isExpandedFrom(&it->second) && (partok->str() == name() || expandedmacros.find(partok->str()) == expandedmacros.end())) {
                     std::set<TokenString> expandedmacros2(expandedmacros); // temporary amnesia to allow reexpansion of currently expanding macros during argument evaluation
                     expandedmacros2.erase(name());
-                    partok = it->second.expand(output, loc, partok, macros, std::move(expandedmacros2));
+                    partok = it->second.expand(output, loc, partok, macros, expandedmacros2);
                 } else {
-                    output.push_back(newMacroToken(partok->str(), loc, isReplaced(expandedmacros), partok));
-                    output.back()->macro = partok->macro;
+                    output->push_back(newMacroToken(partok->str(), loc, isReplaced(expandedmacros), partok));
+                    output->back()->macro = partok->macro;
                     partok = partok->next;
                 }
             }
-            if (tok->whitespaceahead && output.back())
-                output.back()->whitespaceahead = true;
+            if (tok->whitespaceahead && output->back())
+                output->back()->whitespaceahead = true;
             return true;
         }
 
@@ -2228,10 +2199,10 @@ namespace simplecpp {
          * @param parametertokens  parameters given when expanding this macro
          * @return token after the X
          */
-        const Token *expandHash(TokenList &output, const Location &loc, const Token *tok, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
+        const Token *expandHash(TokenList *output, const Location &loc, const Token *tok, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {
             TokenList tokenListHash(files);
             const MacroMap macros2; // temporarily bypass macro expansion
-            tok = expandToken(tokenListHash, loc, tok->next, macros2, expandedmacros, parametertokens);
+            tok = expandToken(&tokenListHash, loc, tok->next, macros2, expandedmacros, parametertokens);
             std::ostringstream ostr;
             ostr << '\"';
             for (const Token *hashtok = tokenListHash.cfront(), *next; hashtok; hashtok = next) {
@@ -2241,7 +2212,7 @@ namespace simplecpp {
                     ostr << ' ';
             }
             ostr << '\"';
-            output.push_back(newMacroToken(escapeString(ostr.str()), loc, isReplaced(expandedmacros)));
+            output->push_back(newMacroToken(escapeString(ostr.str()), loc, isReplaced(expandedmacros)));
             return tok;
         }
 
@@ -2257,8 +2228,8 @@ namespace simplecpp {
          * @param expandResult     expand ## result i.e. "AB"?
          * @return token after B
          */
-        const Token *expandHashHash(TokenList &output, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens, bool expandResult=true) const {
-            Token *A = output.back();
+        const Token *expandHashHash(TokenList *output, const Location &loc, const Token *tok, const MacroMap &macros, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens, bool expandResult=true) const {
+            Token *A = output->back();
             if (!A)
                 throw invalidHashHash(tok->location, name(), "Missing first argument");
             if (!sameline(tok, tok->next) || !sameline(tok, tok->next->next))
@@ -2268,7 +2239,7 @@ namespace simplecpp {
             const bool canBeConcatenatedStringOrChar = isStringLiteral_(A->str()) || isCharLiteral_(A->str());
             const bool unexpectedA = (!A->name && !A->number && !A->str().empty() && !canBeConcatenatedWithEqual && !canBeConcatenatedStringOrChar);
 
-            const Token * const B = tok->next->next;
+            Token * const B = tok->next->next;
             if (!B->name && !B->number && B->op && !B->isOneOf("#="))
                 throw invalidHashHash::unexpectedToken(tok->location, name(), B);
 
@@ -2289,20 +2260,20 @@ namespace simplecpp {
 
                 // It seems clearer to handle this case separately even though the code is similar-ish, but we don't want to merge here.
                 // TODO The question is whether the ## or varargs may still apply, and how to provoke?
-                if (expandArg(tokensB, B, parametertokens)) {
+                if (expandArg(&tokensB, B, parametertokens)) {
                     for (Token *b = tokensB.front(); b; b = b->next)
                         b->location = loc;
                 } else {
                     tokensB.push_back(new Token(*B));
                     tokensB.back()->location = loc;
                 }
-                output.takeTokens(tokensB);
+                output->takeTokens(tokensB);
             } else {
                 std::string strAB;
 
                 const bool varargs = variadic && !args.empty() && B->str() == args[args.size()-1U];
 
-                if (expandArg(tokensB, B, parametertokens)) {
+                if (expandArg(&tokensB, B, parametertokens)) {
                     if (tokensB.empty())
                         strAB = A->str();
                     else if (varargs && A->op == ',')
@@ -2328,27 +2299,27 @@ namespace simplecpp {
                 }
 
                 if (varargs && tokensB.empty() && tok->previous->str() == ",")
-                    output.deleteToken(A);
+                    output->deleteToken(A);
                 else if (strAB != "," && macros.find(strAB) == macros.end()) {
                     A->setstr(strAB);
                     for (Token *b = tokensB.front(); b; b = b->next)
                         b->location = loc;
-                    output.takeTokens(tokensB);
+                    output->takeTokens(tokensB);
                 } else if (sameline(B, nextTok) && sameline(B, nextTok->next) && nextTok->op == '#' && nextTok->next->op == '#') {
                     TokenList output2(files);
                     output2.push_back(new Token(strAB, tok->location));
-                    nextTok = expandHashHash(output2, loc, nextTok, macros, expandedmacros, parametertokens);
-                    output.deleteToken(A);
-                    output.takeTokens(output2);
+                    nextTok = expandHashHash(&output2, loc, nextTok, macros, expandedmacros, parametertokens);
+                    output->deleteToken(A);
+                    output->takeTokens(output2);
                 } else {
-                    output.deleteToken(A);
+                    output->deleteToken(A);
                     TokenList tokens(files);
                     tokens.push_back(new Token(strAB, tok->location));
                     // for function like macros, push the (...)
                     if (tokensB.empty() && sameline(B,B->next) && B->next->op=='(') {
                         const MacroMap::const_iterator it = macros.find(strAB);
                         if (it != macros.end() && expandedmacros.find(strAB) == expandedmacros.end() && it->second.functionLike()) {
-                            const Token * const tok2 = appendTokens(tokens, loc, B->next, macros, expandedmacros, parametertokens);
+                            const Token * const tok2 = appendTokens(&tokens, loc, B->next, macros, expandedmacros, parametertokens);
                             if (tok2)
                                 nextTok = tok2->next;
                         }
@@ -2356,10 +2327,10 @@ namespace simplecpp {
                     if (expandResult)
                         expandToken(output, loc, tokens.cfront(), macros, expandedmacros, parametertokens);
                     else
-                        output.takeTokens(tokens);
+                        output->takeTokens(tokens);
                     for (Token *b = tokensB.front(); b; b = b->next)
                         b->location = loc;
-                    output.takeTokens(tokensB);
+                    output->takeTokens(tokensB);
                 }
             }
 
@@ -2403,8 +2374,8 @@ namespace simplecpp {
         bool variadicOpt;
 
         /** Expansion value for varadic macros with __VA_OPT__ expanded and discarded respectively */
-        const TokenList *optExpandValue{};
-        const TokenList *optNoExpandValue{};
+        const TokenList *optExpandValue;
+        const TokenList *optNoExpandValue;
 
         /** was the value of this macro actually defined in the code? */
         bool valueDefinedInCode_;
@@ -2414,17 +2385,12 @@ namespace simplecpp {
 namespace simplecpp {
 
 #ifdef __CYGWIN__
-    static bool startsWith(const std::string &s, const std::string &p)
-    {
-        return (s.size() >= p.size()) && std::equal(p.begin(), p.end(), s.begin());
-    }
-
     std::string convertCygwinToWindowsPath(const std::string &cygwinPath)
     {
         std::string windowsPath;
 
         std::string::size_type pos = 0;
-        if (cygwinPath.size() >= 11 && startsWith(cygwinPath, "/cygdrive/")) {
+        if (cygwinPath.size() >= 11 && startsWith_(cygwinPath, "/cygdrive/")) {
             const unsigned char driveLetter = cygwinPath[10];
             if (std::isalpha(driveLetter)) {
                 if (cygwinPath.size() == 11) {
@@ -2449,26 +2415,21 @@ namespace simplecpp {
         return windowsPath;
     }
 #endif
+}
 
-    bool isAbsolutePath(const std::string &path)
-    {
 #ifdef SIMPLECPP_WINDOWS
-        // C:\\path\\file
-        // C:/path/file
-        if (path.length() >= 3 && std::isalpha(path[0]) && path[1] == ':' && (path[2] == '\\' || path[2] == '/'))
-            return true;
-
-        // \\host\path\file
-        // //host/path/file
-        if (path.length() >= 2 && (path[0] == '\\' || path[0] == '/') && (path[1] == '\\' || path[1] == '/'))
-            return true;
-
-        return false;
+static bool isAbsolutePath(const std::string &path)
+{
+    if (path.length() >= 3 && path[0] > 0 && std::isalpha(path[0]) && path[1] == ':' && (path[2] == '\\' || path[2] == '/'))
+        return true;
+    return path.length() > 1U && (path[0] == '/' || path[0] == '\\');
+}
 #else
-        return !path.empty() && path[0] == '/';
-#endif
-    }
+static bool isAbsolutePath(const std::string &path)
+{
+    return path.length() > 1U && path[0] == '/';
 }
+#endif
 
 namespace simplecpp {
     /**
@@ -2551,11 +2512,11 @@ static void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::strin
     for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
         if (tok->str() != "sizeof")
             continue;
-        const simplecpp::Token *tok1 = tok->next;
+        simplecpp::Token *tok1 = tok->next;
         if (!tok1) {
             throw std::runtime_error("missing sizeof argument");
         }
-        const simplecpp::Token *tok2 = tok1->next;
+        simplecpp::Token *tok2 = tok1->next;
         if (!tok2) {
             throw std::runtime_error("missing sizeof argument");
         }
@@ -2570,7 +2531,7 @@ static void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::strin
         }
 
         std::string type;
-        for (const simplecpp::Token *typeToken = tok1; typeToken != tok2; typeToken = typeToken->next) {
+        for (simplecpp::Token *typeToken = tok1; typeToken != tok2; typeToken = typeToken->next) {
             if ((typeToken->str() == "unsigned" || typeToken->str() == "signed") && typeToken->next->name)
                 continue;
             if (typeToken->str() == "*" && type.find('*') != std::string::npos)
@@ -2595,7 +2556,7 @@ static void simplifySizeof(simplecpp::TokenList &expr, const std::map<std::strin
 static bool isCpp17OrLater(const simplecpp::DUI &dui)
 {
     const std::string std_ver = simplecpp::getCppStdString(dui.std);
-    return std_ver.empty() || (std_ver >= "201703L");
+    return !std_ver.empty() && (std_ver >= "201703L");
 }
 
 static bool isGnu(const simplecpp::DUI &dui)
@@ -2621,11 +2582,11 @@ static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI
     for (simplecpp::Token *tok = expr.front(); tok; tok = tok->next) {
         if (tok->str() != HAS_INCLUDE)
             continue;
-        const simplecpp::Token *tok1 = tok->next;
+        simplecpp::Token *tok1 = tok->next;
         if (!tok1) {
             throw std::runtime_error("missing __has_include argument");
         }
-        const simplecpp::Token *tok2 = tok1->next;
+        simplecpp::Token *tok2 = tok1->next;
         if (!tok2) {
             throw std::runtime_error("missing __has_include argument");
         }
@@ -2643,7 +2604,7 @@ static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI
         const bool systemheader = (tok1 && tok1->op == '<');
         std::string header;
         if (systemheader) {
-            const simplecpp::Token *tok3 = tok1->next;
+            simplecpp::Token *tok3 = tok1->next;
             if (!tok3) {
                 throw std::runtime_error("missing __has_include closing angular bracket");
             }
@@ -2654,7 +2615,7 @@ static void simplifyHasInclude(simplecpp::TokenList &expr, const simplecpp::DUI
                 }
             }
 
-            for (const simplecpp::Token *headerToken = tok1->next; headerToken != tok3; headerToken = headerToken->next)
+            for (simplecpp::Token *headerToken = tok1->next; headerToken != tok3; headerToken = headerToken->next)
                 header += headerToken->str();
         } else {
             header = tok1->str().substr(1U, tok1->str().size() - 2U);
@@ -2706,7 +2667,7 @@ static unsigned long long stringToULLbounded(
     int base = 0,
     std::ptrdiff_t minlen = 1,
     std::size_t maxlen = std::string::npos
-    )
+)
 {
     const std::string sub = s.substr(pos, maxlen);
     const char * const start = sub.c_str();
@@ -3029,7 +2990,7 @@ static std::string openHeaderDirect(std::ifstream &f, const std::string &path)
 
 static std::string openHeader(std::ifstream &f, const simplecpp::DUI &dui, const std::string &sourcefile, const std::string &header, bool systemheader)
 {
-    if (simplecpp::isAbsolutePath(header))
+    if (isAbsolutePath(header))
         return openHeaderDirect(f, simplecpp::simplifyPath(header));
 
     // prefer first to search the header relatively to source file if found, when not a system header
@@ -3063,7 +3024,8 @@ std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::tryload(FileDat
         return {id_it->second, false};
     }
 
-    FileData *const data = new FileData {path, TokenList(path, filenames, outputList)};
+    std::ifstream f(path);
+    FileData *const data = new FileData {path, TokenList(f, filenames, path, outputList)};
 
     if (dui.removeComments)
         data->tokens.removeComments();
@@ -3123,7 +3085,7 @@ std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get(const std::
 
 bool simplecpp::FileDataCache::getFileId(const std::string &path, FileID &id)
 {
-#ifdef _WIN32
+#ifdef SIMPLECPP_WINDOWS
     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)
@@ -3170,7 +3132,7 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
                 err.type = simplecpp::Output::EXPLICIT_INCLUDE_NOT_FOUND;
                 err.location = Location(filenames);
                 err.msg = "Can not open include file '" + filename + "' that is explicitly included.";
-                outputList->push_back(std::move(err));
+                outputList->push_back(err);
             }
             continue;
         }
@@ -3232,18 +3194,18 @@ simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens,
 static bool preprocessToken(simplecpp::TokenList &output, const simplecpp::Token **tok1, simplecpp::MacroMap &macros, std::vector<std::string> &files, simplecpp::OutputList *outputList)
 {
     const simplecpp::Token * const tok = *tok1;
-    const simplecpp::MacroMap::const_iterator it = tok->name ? macros.find(tok->str()) : macros.end();
+    const simplecpp::MacroMap::const_iterator it = macros.find(tok->str());
     if (it != macros.end()) {
         simplecpp::TokenList value(files);
         try {
-            *tok1 = it->second.expand(value, tok, macros, files);
+            *tok1 = it->second.expand(&value, tok, macros, files);
         } catch (simplecpp::Macro::Error &err) {
             if (outputList) {
                 simplecpp::Output out(files);
                 out.type = simplecpp::Output::SYNTAX_ERROR;
                 out.location = err.location;
                 out.msg = "failed to expand \'" + tok->str() + "\', " + err.what;
-                outputList->push_back(std::move(out));
+                outputList->push_back(out);
             }
             return false;
         }
@@ -3371,7 +3333,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
     // True => code in current #if block should be kept
     // ElseIsTrue => code in current #if block should be dropped. the code in the #else should be kept.
     // AlwaysFalse => drop all code in #if and #else
-    enum IfState : std::uint8_t { True, ElseIsTrue, AlwaysFalse };
+    enum IfState { True, ElseIsTrue, AlwaysFalse };
     std::stack<int> ifstates;
     std::stack<const Token *> iftokens;
     ifstates.push(True);
@@ -3387,7 +3349,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
             includetokenstack.push(filedata->tokens.cfront());
     }
 
-    std::map<std::string, std::list<Location>> maybeUsedMacros;
+    std::map<std::string, std::list<Location> > maybeUsedMacros;
 
     for (const Token *rawtok = nullptr; rawtok || !includetokenstack.empty();) {
         if (rawtok == nullptr) {
@@ -3430,7 +3392,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                         err.msg += tok->str();
                     }
                     err.msg = '#' + rawtok->str() + ' ' + err.msg;
-                    outputList->push_back(std::move(err));
+                    outputList->push_back(err);
                 }
                 if (rawtok->str() == ERROR) {
                     output.clear();
@@ -3590,7 +3552,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                                     out.type = Output::SYNTAX_ERROR;
                                     out.location = rawtok->location;
                                     out.msg = "failed to evaluate " + std::string(rawtok->str() == IF ? "#if" : "#elif") + " condition";
-                                    outputList->push_back(std::move(out));
+                                    outputList->push_back(out);
                                 }
                                 output.clear();
                                 return;
@@ -3618,11 +3580,9 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                                     header = tok->str().substr(1U, tok->str().size() - 2U);
                                     closingAngularBracket = true;
                                 }
-                                if (tok) {
-                                    std::ifstream f;
-                                    const std::string header2 = openHeader(f,dui,sourcefile,header,systemheader);
-                                    expr.push_back(new Token(header2.empty() ? "0" : "1", tok->location));
-                                }
+                                std::ifstream f;
+                                const std::string header2 = openHeader(f,dui,sourcefile,header,systemheader);
+                                expr.push_back(new Token(header2.empty() ? "0" : "1", tok->location));
                             }
                             if (par)
                                 tok = tok ? tok->next : nullptr;
@@ -3658,7 +3618,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                                 E += (E.empty() ? "" : " ") + tok->str();
                             const long long result = evaluate(expr, dui, sizeOfType);
                             conditionIsTrue = (result != 0);
-                            ifCond->emplace_back(rawtok->location, E, result);
+                            ifCond->push_back(IfCond(rawtok->location, E, result));
                         } else {
                             const long long result = evaluate(expr, dui, sizeOfType);
                             conditionIsTrue = (result != 0);
@@ -3771,7 +3731,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
                 mu.macroName = macro.name();
                 mu.macroLocation = macro.defineLocation();
                 mu.useLocation = *usageIt;
-                macroUsage->push_back(std::move(mu));
+                macroUsage->push_back(mu);
             }
         }
     }
@@ -3786,16 +3746,14 @@ simplecpp::cstd_t simplecpp::getCStd(const std::string &std)
 {
     if (std == "c90" || std == "c89" || std == "iso9899:1990" || std == "iso9899:199409" || std == "gnu90" || std == "gnu89")
         return C89;
-    if (std == "c99" || std == "c9x" || std == "iso9899:1999" || std == "iso9899:199x" || std == "gnu99" || std == "gnu9x")
+    if (std == "c99" || std == "c9x" || std == "iso9899:1999" || std == "iso9899:199x" || std == "gnu99"|| std == "gnu9x")
         return C99;
     if (std == "c11" || std == "c1x" || std == "iso9899:2011" || std == "gnu11" || std == "gnu1x")
         return C11;
-    if (std == "c17" || std == "c18" || std == "iso9899:2017" || std == "iso9899:2018" || std == "gnu17" || std == "gnu18")
+    if (std == "c17" || std == "c18" || std == "iso9899:2017" || std == "iso9899:2018" || std == "gnu17"|| std == "gnu18")
         return C17;
     if (std == "c23" || std == "gnu23" || std == "c2x" || std == "gnu2x")
         return C23;
-    if (std == "c2y" || std == "gnu2y")
-        return C2Y;
     return CUnknown;
 }
 
@@ -3817,10 +3775,6 @@ std::string simplecpp::getCStdString(cstd_t std)
         // Clang 14, 15, 16, 17 return "202000L"
         // Clang 9, 10, 11, 12, 13, 14, 15, 16, 17 do not support "c23" and "gnu23"
         return "202311L";
-    case C2Y:
-        // supported by GCC 15+ and Clang 19+
-        // Clang 19, 20, 21, 22 return "202400L"
-        return "202500L";
     case CUnknown:
         return "";
     }
@@ -3872,7 +3826,7 @@ std::string simplecpp::getCppStdString(cppstd_t std)
         // Clang 17, 18 return "202302L"
         return "202302L";
     case CPP26:
-        // supported by GCC 14+ and Clang 17+
+        // supported by Clang 17+
         return "202400L";
     case CPPUnknown:
         return "";
diff --git a/externals/simplecpp/simplecpp.h b/externals/simplecpp/simplecpp.h
old mode 100644
new mode 100755
index da859cbab41..8268fa8d6a3
--- a/externals/simplecpp/simplecpp.h
+++ b/externals/simplecpp/simplecpp.h
@@ -6,8 +6,11 @@
 #ifndef simplecppH
 #define simplecppH
 
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+#  define SIMPLECPP_WINDOWS
+#endif
+
 #include <cctype>
-#include <cstdint>
 #include <cstring>
 #include <iosfwd>
 #include <list>
@@ -17,16 +20,6 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
-#if __cplusplus >= 202002L
-#  include <version>
-#endif
-
-#if defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
-#include <string_view>
-#endif
-#ifdef __cpp_lib_span
-#include <span>
-#endif
 
 #ifdef _WIN32
 #  ifdef SIMPLECPP_EXPORT
@@ -40,7 +33,9 @@
 #  define SIMPLECPP_LIB
 #endif
 
-#ifndef _WIN32
+#ifdef SIMPLECPP_WINDOWS
+#  include <cstdint>
+#else
 #  include <sys/stat.h>
 #endif
 
@@ -51,23 +46,14 @@
 #  pragma warning(disable : 4244)
 #endif
 
-// provide legacy (i.e. raw pointer) API for TokenList
-// note: std::istream has an overhead compared to raw pointers
-#ifndef SIMPLECPP_TOKENLIST_ALLOW_PTR
-// still provide the legacy API in case we lack the performant wrappers
-#  if !defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
-#    define SIMPLECPP_TOKENLIST_ALLOW_PTR
-#  endif
-#endif
-
 namespace simplecpp {
     /** C code standard */
-    enum cstd_t : std::int8_t { CUnknown=-1, C89, C99, C11, C17, C23, C2Y };
+    enum cstd_t { CUnknown=-1, C89, C99, C11, C17, C23 };
 
     /** C++ code standard */
-    enum cppstd_t : std::int8_t { CPPUnknown=-1, CPP03, CPP11, CPP14, CPP17, CPP20, CPP23, CPP26 };
+    enum cppstd_t { CPPUnknown=-1, CPP03, CPP11, CPP14, CPP17, CPP20, CPP23, CPP26 };
 
-    using TokenString = std::string;
+    typedef std::string TokenString;
     class Macro;
     class FileDataCache;
 
@@ -128,7 +114,16 @@ namespace simplecpp {
         }
 
         Token(const Token &tok) :
-            macro(tok.macro), op(tok.op), comment(tok.comment), name(tok.name), number(tok.number), whitespaceahead(tok.whitespaceahead), location(tok.location), previous(nullptr), next(nullptr), nextcond(nullptr), string(tok.string), mExpandedFrom(tok.mExpandedFrom) {}
+            macro(tok.macro), op(tok.op), comment(tok.comment), name(tok.name), number(tok.number), whitespaceahead(tok.whitespaceahead), location(tok.location), previous(nullptr), next(nullptr), nextcond(nullptr), string(tok.string), mExpandedFrom(tok.mExpandedFrom) {
+        }
+
+        void flags() {
+            name = (std::isalpha(static_cast<unsigned char>(string[0])) || string[0] == '_' || string[0] == '$')
+                   && (std::memchr(string.c_str(), '\'', string.size()) == nullptr);
+            comment = string.size() > 1U && string[0] == '/' && (string[1] == '/' || string[1] == '*');
+            number = isNumberLike(string);
+            op = (string.size() == 1U && !name && !comment && !number) ? string[0] : '\0';
+        }
 
         const TokenString& str() const {
             return string;
@@ -184,14 +179,6 @@ namespace simplecpp {
         void printAll() const;
         void printOut() const;
     private:
-        void flags() {
-            name = (std::isalpha(static_cast<unsigned char>(string[0])) || string[0] == '_' || string[0] == '$')
-                   && (std::memchr(string.c_str(), '\'', string.size()) == nullptr);
-            comment = string.size() > 1U && string[0] == '/' && (string[1] == '/' || string[1] == '*');
-            number = isNumberLike(string);
-            op = (string.size() == 1U && !name && !comment && !number) ? string[0] : '\0';
-        }
-
         TokenString string;
 
         std::set<const Macro*> mExpandedFrom;
@@ -203,7 +190,7 @@ namespace simplecpp {
     /** Output from preprocessor */
     struct SIMPLECPP_LIB Output {
         explicit Output(const std::vector<std::string> &files) : type(ERROR), location(files) {}
-        enum Type : std::uint8_t {
+        enum Type {
             ERROR, /* #error */
             WARNING, /* #warning */
             MISSING_HEADER,
@@ -220,7 +207,7 @@ namespace simplecpp {
         std::string msg;
     };
 
-    using OutputList = std::list<Output>;
+    typedef std::list<Output> OutputList;
 
     /** List of tokens. */
     class SIMPLECPP_LIB TokenList {
@@ -230,45 +217,10 @@ namespace simplecpp {
         explicit TokenList(std::vector<std::string> &filenames);
         /** generates a token list from the given std::istream parameter */
         TokenList(std::istream &istr, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr);
-#ifdef SIMPLECPP_TOKENLIST_ALLOW_PTR
-        /** generates a token list from the given buffer */
-        template<size_t size>
-        TokenList(const char (&data)[size], std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(reinterpret_cast<const unsigned char*>(data), size-1, filenames, filename, outputList, 0)
-        {}
-        /** generates a token list from the given buffer */
-        template<size_t size>
-        TokenList(const unsigned char (&data)[size], std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(data, size-1, filenames, filename, outputList, 0)
-        {}
-
-        /** generates a token list from the given buffer */
-        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(data, size, filenames, filename, outputList, 0)
-        {}
-        /** generates a token list from the given buffer */
-        TokenList(const char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(reinterpret_cast<const unsigned char*>(data), size, filenames, filename, outputList, 0)
-        {}
-#endif
-#if defined(__cpp_lib_string_view) && !defined(__cpp_lib_span)
         /** generates a token list from the given buffer */
-        TokenList(std::string_view data, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(reinterpret_cast<const unsigned char*>(data.data()), data.size(), filenames, filename, outputList, 0)
-        {}
-#endif
-#ifdef __cpp_lib_span
-        /** generates a token list from the given buffer */
-        TokenList(std::span<const char> data, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(reinterpret_cast<const unsigned char*>(data.data()), data.size(), filenames, filename, outputList, 0)
-        {}
-
+        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr);
         /** generates a token list from the given buffer */
-        TokenList(std::span<const unsigned char> data, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr)
-            : TokenList(data.data(), data.size(), filenames, filename, outputList, 0)
-        {}
-#endif
-
+        TokenList(const char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename=std::string(), OutputList *outputList = nullptr);
         /** generates a token list from the given filename parameter */
         TokenList(const std::string &filename, std::vector<std::string> &filenames, OutputList *outputList = nullptr);
         TokenList(const TokenList &other);
@@ -283,8 +235,8 @@ namespace simplecpp {
         }
         void push_back(Token *tok);
 
-        void dump(bool linenrs = false) const;
-        std::string stringify(bool linenrs = false) const;
+        void dump() const;
+        std::string stringify() const;
 
         void readfile(Stream &stream, const std::string &filename=std::string(), OutputList *outputList = nullptr);
         void constFold();
@@ -344,8 +296,6 @@ namespace simplecpp {
         }
 
     private:
-        TokenList(const unsigned char* data, std::size_t size, std::vector<std::string> &filenames, const std::string &filename, OutputList *outputList, int unused);
-
         void combineOperators();
 
         void constFoldUnaryNotPosNeg(Token *tok);
@@ -375,9 +325,9 @@ namespace simplecpp {
     struct SIMPLECPP_LIB MacroUsage {
         explicit MacroUsage(const std::vector<std::string> &f, bool macroValueKnown_) : macroLocation(f), useLocation(f), macroValueKnown(macroValueKnown_) {}
         std::string macroName;
-        Location macroLocation;
-        Location useLocation;
-        bool macroValueKnown;
+        Location    macroLocation;
+        Location    useLocation;
+        bool        macroValueKnown;
     };
 
     /** Tracking #if/#elif expressions */
@@ -425,7 +375,6 @@ namespace simplecpp {
         std::pair<FileData *, bool> get(const std::string &sourcefile, const std::string &header, const DUI &dui, bool systemheader, std::vector<std::string> &filenames, OutputList *outputList);
 
         void insert(FileData data) {
-            // NOLINTNEXTLINE(misc-const-correctness) - FP
             FileData *const newdata = new FileData(std::move(data));
 
             mData.emplace_back(newdata);
@@ -438,10 +387,10 @@ namespace simplecpp {
             mData.clear();
         }
 
-        using container_type = std::vector<std::unique_ptr<FileData>>;
-        using iterator = container_type::iterator;
-        using const_iterator = container_type::const_iterator;
-        using size_type = container_type::size_type;
+        typedef std::vector<std::unique_ptr<FileData>> container_type;
+        typedef container_type::iterator iterator;
+        typedef container_type::const_iterator const_iterator;
+        typedef container_type::size_type size_type;
 
         size_type size() const {
             return mData.size();
@@ -467,7 +416,7 @@ namespace simplecpp {
 
     private:
         struct FileID {
-#ifdef _WIN32
+#ifdef SIMPLECPP_WINDOWS
             struct {
                 std::uint64_t VolumeSerialNumber;
                 struct {
@@ -491,7 +440,7 @@ namespace simplecpp {
 #endif
             struct Hasher {
                 std::size_t operator()(const FileID &id) const {
-#ifdef _WIN32
+#ifdef SIMPLECPP_WINDOWS
                     return static_cast<std::size_t>(id.fileIdInfo.FileId.IdentifierHi ^ id.fileIdInfo.FileId.IdentifierLo ^
                                                     id.fileIdInfo.VolumeSerialNumber);
 #else
@@ -555,17 +504,10 @@ namespace simplecpp {
     /** Returns the __cplusplus value for a given standard */
     SIMPLECPP_LIB std::string getCppStdString(const std::string &std);
     SIMPLECPP_LIB std::string getCppStdString(cppstd_t std);
-
-    /** Checks if given path is absolute */
-    SIMPLECPP_LIB bool isAbsolutePath(const std::string &path);
 }
 
-#undef SIMPLECPP_TOKENLIST_ALLOW_PTR
-
 #if defined(_MSC_VER)
 #  pragma warning(pop)
 #endif
 
-#undef SIMPLECPP_LIB
-
 #endif
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 749fe27796e..ceb36b950dd 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -295,7 +295,6 @@ MainWindow::MainWindow(TranslationHandler* th, QSettings* settings) :
     mUI->mActionC11->setActionGroup(mCStandardActions);
     //mUI->mActionC17->setActionGroup(mCStandardActions);
     //mUI->mActionC23->setActionGroup(mCStandardActions);
-    //mUI->mActionC2Y->setActionGroup(mCStandardActions);
 
     mUI->mActionCpp03->setActionGroup(mCppStandardActions);
     mUI->mActionCpp11->setActionGroup(mCppStandardActions);
@@ -422,7 +421,6 @@ void MainWindow::loadSettings()
     mUI->mActionC11->setChecked(standards.c == Standards::C11);
     //mUI->mActionC17->setChecked(standards.c == Standards::C17);
     //mUI->mActionC23->setChecked(standards.c == Standards::C23);
-    //mUI->mActionC2Y->setChecked(standards.c == Standards::C2Y);
     standards.setCPP(mSettings->value(SETTINGS_STD_CPP, QString()).toString().toStdString());
     mUI->mActionCpp03->setChecked(standards.cpp == Standards::CPP03);
     mUI->mActionCpp11->setChecked(standards.cpp == Standards::CPP11);
@@ -524,8 +522,6 @@ void MainWindow::saveSettings() const
     //    mSettings->setValue(SETTINGS_STD_C, "C17");
     //if (mUI->mActionC23->isChecked())
     //    mSettings->setValue(SETTINGS_STD_C, "C23");
-    //if (mUI->mActionC2Y->isChecked())
-    //    mSettings->setValue(SETTINGS_STD_C, "C2Y");
 
     if (mUI->mActionCpp03->isChecked())
         mSettings->setValue(SETTINGS_STD_CPP, "C++03");
diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index a90949344e2..bf83b86a65e 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -229,7 +229,6 @@
      <addaction name="mActionC11"/>
      <!--addaction name="mActionC17"/-->
      <!--addaction name="mActionC23"/-->
-     <!--addaction name="mActionC2Y"/-->
     </widget>
     <addaction name="mActionAnalyzeFiles"/>
     <addaction name="mActionAnalyzeDirectory"/>
@@ -829,14 +828,6 @@
     <string>C&amp;23</string>
    </property>
   </action-->
-  <!--action name="mActionC2Y">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>C&amp;2y</string>
-   </property>
-  </action-->
   <action name="mActionC89">
    <property name="checkable">
     <bool>true</bool>
diff --git a/lib/keywords.cpp b/lib/keywords.cpp
index c850c959f0d..7642c3811d4 100644
--- a/lib/keywords.cpp
+++ b/lib/keywords.cpp
@@ -77,13 +77,6 @@ static const std::unordered_set<std::string> c23_keywords = {
     C23_KEYWORDS
 };
 
-static const std::unordered_set<std::string> c2y_keywords_all = {
-    C90_KEYWORDS, C99_KEYWORDS, C11_KEYWORDS, C23_KEYWORDS
-};
-
-static const std::unordered_set<std::string> c2y_keywords = {
-};
-
 // see https://en.cppreference.com/w/cpp/keyword
 
 #define CPP03_KEYWORDS \
@@ -188,8 +181,6 @@ const std::unordered_set<std::string>& Keywords::getAll(Standards::cstd_t cStd)
         return c17_keywords_all;
     case Standards::cstd_t::C23:
         return c23_keywords_all;
-    case Standards::cstd_t::C2Y:
-        return c2y_keywords_all;
     }
     cppcheck::unreachable();
 }
@@ -231,8 +222,6 @@ const std::unordered_set<std::string>& Keywords::getOnly(Standards::cstd_t cStd)
         return c17_keywords;
     case Standards::cstd_t::C23:
         return c23_keywords;
-    case Standards::cstd_t::C2Y:
-        return c2y_keywords;
     }
     cppcheck::unreachable();
 }
diff --git a/lib/standards.cpp b/lib/standards.cpp
index 429d4506f30..9f7c48e4c80 100644
--- a/lib/standards.cpp
+++ b/lib/standards.cpp
@@ -36,8 +36,6 @@ static Standards::cstd_t mapC(simplecpp::cstd_t cstd) {
         return Standards::C17;
     case simplecpp::C23:
         return Standards::C23;
-    case simplecpp::C2Y:
-        return Standards::C2Y;
     case simplecpp::CUnknown:
         return Standards::CLatest;
     }
@@ -75,8 +73,6 @@ std::string Standards::getC(cstd_t c_std)
         return "c17";
     case C23:
         return "c23";
-    case C2Y:
-        return "c2y";
     }
     return "";
 }
diff --git a/lib/standards.h b/lib/standards.h
index cde45f92411..deebb3521d0 100644
--- a/lib/standards.h
+++ b/lib/standards.h
@@ -38,7 +38,7 @@ struct CPPCHECKLIB Standards {
     enum Language : std::uint8_t { None, C, CPP };
 
     /** C code standard */
-    enum cstd_t : std::uint8_t { C89, C99, C11, C17, C23, C2Y, CLatest = C2Y } c = CLatest;
+    enum cstd_t : std::uint8_t { C89, C99, C11, C17, C23, CLatest = C23 } c = CLatest;
 
     /** C++ code standard */
     enum cppstd_t : std::uint8_t { CPP03, CPP11, CPP14, CPP17, CPP20, CPP23, CPP26, CPPLatest = CPP26 } cpp = CPPLatest;