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 2016-07-29 20:54:11 +02:00
parent 5611a71820
commit ab59a6e19d
1 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
externals/simplecpp/simplecpp.cpp vendored
View File

@ -290,7 +290,7 @@ static unsigned short getAndSkipBOM(std::istream &istr) {
bool isNameChar(unsigned char ch) { bool isNameChar(unsigned char ch) {
return std::isalnum(ch) || ch == '_' || ch == '$'; return std::isalnum(ch) || ch == '_' || ch == '$';
} }
void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filename, OutputList *outputList) void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filename, OutputList *outputList)
{ {
@ -1045,13 +1045,11 @@ private:
return nameToken->next; return nameToken->next;
} }
if (nameToken->str == "__COUNTER__") { if (nameToken->str == "__COUNTER__") {
output->push_back(new Token(toString(usageList.size()), loc)); output->push_back(new Token(toString(usageList.size()-1U), loc));
return nameToken->next; return nameToken->next;
} }
const std::vector<const Token*> parametertokens(getMacroParameters(nameToken, !expandedmacros1.empty())); std::vector<const Token*> parametertokens1(getMacroParameters(nameToken, !expandedmacros1.empty()));
Token * const output_end_1 = output->back();
if (functionLike()) { if (functionLike()) {
// No arguments => not macro expansion // No arguments => not macro expansion
@ -1062,24 +1060,60 @@ private:
// Parse macro-call // Parse macro-call
if (variadic) { if (variadic) {
if (parametertokens.size() < args.size()) { if (parametertokens1.size() < args.size()) {
throw wrongNumberOfParameters(nameToken->location, name()); throw wrongNumberOfParameters(nameToken->location, name());
} }
} else { } else {
if (parametertokens.size() != args.size() + (args.empty() ? 2U : 1U)) if (parametertokens1.size() != args.size() + (args.empty() ? 2U : 1U))
throw wrongNumberOfParameters(nameToken->location, name()); throw wrongNumberOfParameters(nameToken->location, name());
} }
} }
// If macro call uses __COUNTER__ then expand that first
TokenList tokensparams(files);
std::vector<const Token *> parametertokens2;
if (!parametertokens1.empty()) {
bool counter = false;
for (const Token *tok = parametertokens1[0]; tok != parametertokens1.back(); tok = tok->next) {
if (tok->str == "__COUNTER__") {
counter = true;
break;
}
}
const std::map<TokenString,Macro>::const_iterator m = macros.find("__COUNTER__");
if (!counter || m == macros.end())
parametertokens2.swap(parametertokens1);
else {
const Macro &counterMacro = m->second;
unsigned int par = 0;
for (const Token *tok = parametertokens1[0]; tok && par < parametertokens1.size(); tok = tok->next) {
if (tok->str == "__COUNTER__") {
tokensparams.push_back(new Token(toString(counterMacro.usageList.size()), tok->location));
counterMacro.usageList.push_back(tok->location);
} else {
tokensparams.push_back(new Token(*tok));
if (tok == parametertokens1[par]) {
parametertokens2.push_back(tokensparams.cback());
par++;
}
}
}
}
}
Token * const output_end_1 = output->back();
// expand // expand
for (const Token *tok = valueToken; tok != endToken;) { for (const Token *tok = valueToken; tok != endToken;) {
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 == '#') {
output->push_back(newMacroToken(expandArgStr(tok, parametertokens), loc, !expandedmacros1.empty())); output->push_back(newMacroToken(expandArgStr(tok, parametertokens2), loc, !expandedmacros1.empty()));
tok = tok->next; tok = tok->next;
} else { } else {
tok = expandToken(output, loc, tok, macros, expandedmacros1, expandedmacros, parametertokens); tok = expandToken(output, loc, tok, macros, expandedmacros1, expandedmacros, parametertokens2);
} }
continue; continue;
} }
@ -1097,7 +1131,7 @@ private:
if (!sameline(tok, tok->next)) if (!sameline(tok, tok->next))
throw invalidHashHash(tok->location, name()); throw invalidHashHash(tok->location, name());
std::string strAB = A->str + expandArgStr(tok->next, parametertokens); std::string strAB = A->str + expandArgStr(tok->next, parametertokens2);
bool removeComma = false; bool removeComma = false;
if (variadic && strAB == "," && tok->previous->previous->str == "," && args.size() >= 1U && tok->next->str == args[args.size()-1U]) if (variadic && strAB == "," && tok->previous->previous->str == "," && args.size() >= 1U && tok->next->str == args[args.size()-1U])
@ -1111,12 +1145,12 @@ private:
TokenList tokens(files); TokenList tokens(files);
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, expandedmacros1, expandedmacros, parametertokens); expandToken(output, loc, tokens.cfront(), macros, expandedmacros1, expandedmacros, parametertokens2);
} }
} else { } else {
// #123 => "123" // #123 => "123"
TokenList tokenListHash(files); TokenList tokenListHash(files);
tok = expandToken(&tokenListHash, loc, tok, macros, expandedmacros1, expandedmacros, parametertokens); tok = expandToken(&tokenListHash, loc, tok, macros, expandedmacros1, expandedmacros, parametertokens2);
std::string s; std::string s;
for (const Token *hashtok = tokenListHash.cfront(); hashtok; hashtok = hashtok->next) for (const Token *hashtok = tokenListHash.cfront(); hashtok; hashtok = hashtok->next)
s += hashtok->str; s += hashtok->str;
@ -1127,7 +1161,10 @@ private:
if (!functionLike()) if (!functionLike())
setMacroName(output, output_end_1, expandedmacros1); setMacroName(output, output_end_1, expandedmacros1);
return functionLike() ? parametertokens.back()->next : nameToken->next; if (!parametertokens1.empty())
parametertokens1.swap(parametertokens2);
return functionLike() ? parametertokens2.back()->next : nameToken->next;
} }
const Token *expandToken(TokenList *output, const Location &loc, const Token *tok, const std::map<TokenString,Macro> &macros, const std::set<TokenString> &expandedmacros1, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const { const Token *expandToken(TokenList *output, const Location &loc, const Token *tok, const std::map<TokenString,Macro> &macros, const std::set<TokenString> &expandedmacros1, const std::set<TokenString> &expandedmacros, const std::vector<const Token*> &parametertokens) const {