walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

bump simplecpp

This commit is contained in:
Daniel Marjamäki 2023-04-05 21:17:48 +02:00
parent edfdfe658a
commit 47fdd1e1e3
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
externals/simplecpp/simplecpp.cpp vendored
View File

@ -23,6 +23,7 @@
#include "simplecpp.h" #include "simplecpp.h"
#include <algorithm> #include <algorithm>
#include <cassert>
#include <climits> #include <climits>
#include <cstddef> #include <cstddef>
#include <cstdlib> #include <cstdlib>
@ -43,7 +44,6 @@
#ifdef SIMPLECPP_WINDOWS #ifdef SIMPLECPP_WINDOWS
#include <windows.h> #include <windows.h>
#undef ERROR #undef ERROR
#undef TRUE
#endif #endif
#if (__cplusplus < 201103L) && !defined(__APPLE__) #if (__cplusplus < 201103L) && !defined(__APPLE__)
@ -351,6 +351,7 @@ public:
StdIStream(std::istream &istr) StdIStream(std::istream &istr)
: istr(istr) : istr(istr)
{ {
assert(istr.good());
init(); init();
} }
@ -378,6 +379,7 @@ public:
, lastCh(0) , lastCh(0)
, lastStatus(0) , lastStatus(0)
{ {
assert(file != nullptr);
init(); init();
} }
@ -3209,12 +3211,12 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
} }
} }
// TRUE => code in current #if block should be kept // True => code in current #if block should be kept
// ELSE_IS_TRUE => code in current #if block should be dropped. the code in the #else should be kept. // ElseIsTrue => code in current #if block should be dropped. the code in the #else should be kept.
// ALWAYS_FALSE => drop all code in #if and #else // AlwaysFalse => drop all code in #if and #else
enum IfState { TRUE, ELSE_IS_TRUE, ALWAYS_FALSE }; enum IfState { True, ElseIsTrue, AlwaysFalse };
std::stack<int> ifstates; std::stack<int> ifstates;
ifstates.push(TRUE); ifstates.push(True);
std::stack<const Token *> includetokenstack; std::stack<const Token *> includetokenstack;
@ -3259,7 +3261,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
return; return;
} }
if (ifstates.top() == TRUE && (rawtok->str() == ERROR || rawtok->str() == WARNING)) { if (ifstates.top() == True && (rawtok->str() == ERROR || rawtok->str() == WARNING)) {
if (outputList) { if (outputList) {
simplecpp::Output err(rawtok->location.files); simplecpp::Output err(rawtok->location.files);
err.type = rawtok->str() == ERROR ? Output::ERROR : Output::WARNING; err.type = rawtok->str() == ERROR ? Output::ERROR : Output::WARNING;
@ -3279,7 +3281,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
} }
if (rawtok->str() == DEFINE) { if (rawtok->str() == DEFINE) {
if (ifstates.top() != TRUE) if (ifstates.top() != True)
continue; continue;
try { try {
const Macro &macro = Macro(rawtok->previous, files); const Macro &macro = Macro(rawtok->previous, files);
@ -3301,7 +3303,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
output.clear(); output.clear();
return; return;
} }
} else if (ifstates.top() == TRUE && rawtok->str() == INCLUDE) { } else if (ifstates.top() == True && rawtok->str() == INCLUDE) {
TokenList inc1(files); TokenList inc1(files);
for (const Token *inctok = rawtok->next; sameline(rawtok,inctok); inctok = inctok->next) { for (const Token *inctok = rawtok->next; sameline(rawtok,inctok); inctok = inctok->next) {
if (!inctok->comment) if (!inctok->comment)
@ -3392,7 +3394,7 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
} }
bool conditionIsTrue; bool conditionIsTrue;
if (ifstates.top() == ALWAYS_FALSE || (ifstates.top() == ELSE_IS_TRUE && rawtok->str() != ELIF)) if (ifstates.top() == AlwaysFalse || (ifstates.top() == ElseIsTrue && rawtok->str() != ELIF))
conditionIsTrue = false; conditionIsTrue = false;
else if (rawtok->str() == IFDEF) { else if (rawtok->str() == IFDEF) {
conditionIsTrue = (macros.find(rawtok->next->str()) != macros.end() || (hasInclude && rawtok->next->str() == HAS_INCLUDE)); conditionIsTrue = (macros.find(rawtok->next->str()) != macros.end() || (hasInclude && rawtok->next->str() == HAS_INCLUDE));
@ -3520,35 +3522,35 @@ void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenL
if (rawtok->str() != ELIF) { if (rawtok->str() != ELIF) {
// push a new ifstate.. // push a new ifstate..
if (ifstates.top() != TRUE) if (ifstates.top() != True)
ifstates.push(ALWAYS_FALSE); ifstates.push(AlwaysFalse);
else else
ifstates.push(conditionIsTrue ? TRUE : ELSE_IS_TRUE); ifstates.push(conditionIsTrue ? True : ElseIsTrue);
} else if (ifstates.top() == TRUE) { } else if (ifstates.top() == True) {
ifstates.top() = ALWAYS_FALSE; ifstates.top() = AlwaysFalse;
} else if (ifstates.top() == ELSE_IS_TRUE && conditionIsTrue) { } else if (ifstates.top() == ElseIsTrue && conditionIsTrue) {
ifstates.top() = TRUE; ifstates.top() = True;
} }
} else if (rawtok->str() == ELSE) { } else if (rawtok->str() == ELSE) {
ifstates.top() = (ifstates.top() == ELSE_IS_TRUE) ? TRUE : ALWAYS_FALSE; ifstates.top() = (ifstates.top() == ElseIsTrue) ? True : AlwaysFalse;
} else if (rawtok->str() == ENDIF) { } else if (rawtok->str() == ENDIF) {
ifstates.pop(); ifstates.pop();
} else if (rawtok->str() == UNDEF) { } else if (rawtok->str() == UNDEF) {
if (ifstates.top() == TRUE) { if (ifstates.top() == True) {
const Token *tok = rawtok->next; const Token *tok = rawtok->next;
while (sameline(rawtok,tok) && tok->comment) while (sameline(rawtok,tok) && tok->comment)
tok = tok->next; tok = tok->next;
if (sameline(rawtok, tok)) if (sameline(rawtok, tok))
macros.erase(tok->str()); macros.erase(tok->str());
} }
} else if (ifstates.top() == TRUE && rawtok->str() == PRAGMA && rawtok->next && rawtok->next->str() == ONCE && sameline(rawtok,rawtok->next)) { } else if (ifstates.top() == True && rawtok->str() == PRAGMA && rawtok->next && rawtok->next->str() == ONCE && sameline(rawtok,rawtok->next)) {
pragmaOnce.insert(rawtok->location.file()); pragmaOnce.insert(rawtok->location.file());
} }
rawtok = gotoNextLine(rawtok); rawtok = gotoNextLine(rawtok);
continue; continue;
} }
if (ifstates.top() != TRUE) { if (ifstates.top() != True) {
// drop code // drop code
rawtok = gotoNextLine(rawtok); rawtok = gotoNextLine(rawtok);
continue; continue;