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

bump simplecpp to 403708c

This commit is contained in:
Daniel Marjamäki 2016-08-24 20:27:29 +02:00
parent 667038a402
commit 9c27211bb6
1 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
externals/simplecpp/simplecpp.cpp vendored
View File

@ -1146,8 +1146,20 @@ private:
} else if (tok->op == '#' && sameline(tok, tok->next) && tok->next->op != '#') { } else if (tok->op == '#' && sameline(tok, tok->next) && tok->next->op != '#') {
tok = expandHash(tokens, tok->location, tok, macros, expandedmacros, parametertokens); tok = expandHash(tokens, tok->location, tok, macros, expandedmacros, parametertokens);
} else { } else {
if (!expandArg(tokens, tok, tok->location, macros, expandedmacros, parametertokens)) if (!expandArg(tokens, tok, tok->location, macros, expandedmacros, parametertokens)) {
tokens->push_back(new Token(*tok)); bool expanded = false;
if (macros.find(tok->str) != macros.end() && expandedmacros.find(tok->str) == expandedmacros.end()) {
const std::map<TokenString, Macro>::const_iterator it = macros.find(tok->str);
const Macro &m = it->second;
if (!m.functionLike()) {
m.expand(tokens, tok, macros, files);
expanded = true;
}
}
if (!expanded)
tokens->push_back(new Token(*tok));
}
if (tok->op == '(') if (tok->op == '(')
++par; ++par;
else if (tok->op == ')') { else if (tok->op == ')') {
@ -1243,6 +1255,8 @@ private:
if (tok->op != '#') { if (tok->op != '#') {
// A##B => AB // A##B => AB
if (tok->next && tok->next->op == '#' && tok->next->next && tok->next->next->op == '#') { if (tok->next && tok->next->op == '#' && tok->next->next && tok->next->next->op == '#') {
if (!sameline(tok, tok->next->next->next))
throw invalidHashHash(tok->location, name());
output->push_back(newMacroToken(expandArgStr(tok, parametertokens2), loc, isReplaced(expandedmacros))); output->push_back(newMacroToken(expandArgStr(tok, parametertokens2), loc, isReplaced(expandedmacros)));
tok = tok->next; tok = tok->next;
} else { } else {
@ -1441,7 +1455,19 @@ private:
throw invalidHashHash(tok->location, name()); throw invalidHashHash(tok->location, name());
Token *B = tok->next->next; Token *B = tok->next->next;
const std::string strAB = A->str + expandArgStr(B, parametertokens); std::string strAB;
TokenList tokensB(files);
if (expandArg(&tokensB, B, parametertokens)) {
if (tokensB.empty())
strAB = A->str;
else {
strAB = A->str + tokensB.cfront()->str;
tokensB.deleteToken(tokensB.front());
}
} else {
strAB = A->str + B->str;
}
bool removeComma = false; bool removeComma = false;
if (variadic && strAB == "," && tok->previous->str == "," && args.size() >= 1U && B->str == args[args.size()-1U]) if (variadic && strAB == "," && tok->previous->str == "," && args.size() >= 1U && B->str == args[args.size()-1U])
@ -1454,6 +1480,9 @@ private:
tokens.push_back(new Token(strAB, tok->location)); tokens.push_back(new Token(strAB, tok->location));
// TODO: For functionLike macros, push the (...) // TODO: For functionLike macros, push the (...)
expandToken(output, loc, tokens.cfront(), macros, expandedmacros, parametertokens); expandToken(output, loc, tokens.cfront(), macros, expandedmacros, parametertokens);
for (Token *b = tokensB.front(); b; b = b->next)
b->location = loc;
output->takeTokens(tokensB);
} }
return B->next; return B->next;
@ -1498,11 +1527,11 @@ private:
namespace simplecpp { namespace simplecpp {
#ifdef SIMPLECPP_WINDOWS #ifdef SIMPLECPP_WINDOWS
std::string realFilename(const std::string &f) { std::string realFilename(const std::string &f) {
WIN32_FIND_DATA FindFileData; WIN32_FIND_DATA FindFileData;
TCHAR buf[4096] = {0}; TCHAR buf[4096] = {0};
for (unsigned int i = 0; i < f.size(); ++i) for (unsigned int i = 0; i < f.size(); ++i)
buf[i] = f[i]; buf[i] = f[i];
HANDLE hFind = FindFirstFile(buf, &FindFileData); HANDLE hFind = FindFirstFile(buf, &FindFileData);
if (hFind == INVALID_HANDLE_VALUE) if (hFind == INVALID_HANDLE_VALUE)
return f; return f;
std::ostringstream ostr; std::ostringstream ostr;