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

simplecpp: Bump latest changes. Fixes #9754 (#5111)

This commit is contained in:
Daniel Marjamäki 2023-06-02 17:52:13 +02:00 committed by GitHub
parent 7c56514bd5
commit 36af9b6450
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
externals/simplecpp/simplecpp.cpp vendored
View File

@ -1925,9 +1925,13 @@ namespace simplecpp {
// Macro parameter.. // Macro parameter..
{ {
TokenList temp(files); TokenList temp(files);
if (expandArg(&temp, tok, loc, macros, expandedmacros, parametertokens)) 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());
return recursiveExpandToken(output, temp, loc, tok, macros, expandedmacros, parametertokens); return recursiveExpandToken(output, temp, loc, tok, macros, expandedmacros, parametertokens);
} }
}
// Macro.. // Macro..
const MacroMap::const_iterator it = macros.find(tok->str()); const MacroMap::const_iterator it = macros.find(tok->str());