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

bump simplecpp to 1a3a3e9

This commit is contained in:
Daniel Marjamäki 2016-08-27 15:09:18 +02:00
parent 36ad0a0514
commit 7b253e77fc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
externals/simplecpp/simplecpp.cpp vendored
View File

@ -1457,11 +1457,15 @@ private:
Token *B = tok->next->next; Token *B = tok->next->next;
std::string strAB; std::string strAB;
const bool varargs = variadic && args.size() >= 1U && B->str == args[args.size()-1U];
TokenList tokensB(files); TokenList tokensB(files);
if (expandArg(&tokensB, B, parametertokens)) { if (expandArg(&tokensB, B, parametertokens)) {
if (tokensB.empty()) if (tokensB.empty())
strAB = A->str; strAB = A->str;
else { else if (varargs && A->op == ',') {
strAB = ",";
} else {
strAB = A->str + tokensB.cfront()->str; strAB = A->str + tokensB.cfront()->str;
tokensB.deleteToken(tokensB.front()); tokensB.deleteToken(tokensB.front());
} }
@ -1470,7 +1474,7 @@ private:
} }
bool removeComma = false; bool removeComma = false;
if (variadic && strAB == "," && tok->previous->str == "," && args.size() >= 1U && B->str == args[args.size()-1U]) if (varargs && tokensB.empty() && tok->previous->str == ",")
removeComma = true; removeComma = true;
output->deleteToken(A); output->deleteToken(A);