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

bump simplecpp to simplecpp revision dbae338e (#5511)

This commit is contained in:
Daniel Marjamäki 2023-10-05 18:20:42 +02:00 committed by GitHub
parent 787da43dc9
commit f1f740883f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
externals/simplecpp/simplecpp.cpp vendored
View File

@ -114,6 +114,8 @@ static const simplecpp::TokenString ONCE("once");
static const simplecpp::TokenString HAS_INCLUDE("__has_include"); static const simplecpp::TokenString HAS_INCLUDE("__has_include");
static const simplecpp::TokenString INNER_COMMA(",,");
template<class T> static std::string toString(T t) template<class T> static std::string toString(T t)
{ {
// NOLINTNEXTLINE(misc-const-correctness) - false positive // NOLINTNEXTLINE(misc-const-correctness) - false positive
@ -1559,6 +1561,10 @@ namespace simplecpp {
rawtok = rawtok2->next; rawtok = rawtok2->next;
} }
output->takeTokens(output2); output->takeTokens(output2);
for (Token* tok = output->front(); tok; tok = tok->next) {
if (tok->str() == INNER_COMMA)
tok->setstr(",");
}
return rawtok; return rawtok;
} }
@ -1733,7 +1739,12 @@ namespace simplecpp {
if (it != macros.end() && expandedmacros.find(tok->str()) == expandedmacros.end()) { if (it != macros.end() && expandedmacros.find(tok->str()) == expandedmacros.end()) {
const Macro &m = it->second; const Macro &m = it->second;
if (!m.functionLike()) { if (!m.functionLike()) {
Token* mtok = tokens->back();
m.expand(tokens, rawloc, tok, macros, expandedmacros); m.expand(tokens, rawloc, tok, macros, expandedmacros);
for (mtok = mtok->next; mtok; mtok = mtok->next) {
if (mtok->op == ',')
mtok->setstr(INNER_COMMA);
}
expanded = true; expanded = true;
} }
} }