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

update simplecpp

This commit is contained in:
Daniel Marjamäki 2017-09-08 23:20:39 +02:00
parent b9b47809f9
commit e7f469c4ba
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
externals/simplecpp/simplecpp.cpp vendored
View File

@ -449,9 +449,12 @@ void simplecpp::TokenList::readfile(std::istream &istr, const std::string &filen
// number or name
if (isNameChar(ch)) {
const bool num = std::isdigit(ch);
while (istr.good() && isNameChar(ch)) {
currentToken += ch;
ch = readChar(istr,bom);
if (num && ch=='\'' && isNameChar(peekChar(istr,bom)))
ch = readChar(istr,bom);
}
ungetChar(istr,bom);
@ -586,6 +589,7 @@ void simplecpp::TokenList::constFold()
constFoldUnaryNotPosNeg(tok);
constFoldMulDivRem(tok);
constFoldAddSub(tok);
constFoldShift(tok);
constFoldComparison(tok);
constFoldBitwise(tok);
constFoldLogicalOp(tok);
@ -766,6 +770,29 @@ void simplecpp::TokenList::constFoldAddSub(Token *tok)
}
}
void simplecpp::TokenList::constFoldShift(Token *tok)
{
for (; tok && tok->op != ')'; tok = tok->next) {
if (!tok->previous || !tok->previous->number)
continue;
if (!tok->next || !tok->next->number)
continue;
long long result;
if (tok->str == "<<")
result = stringToLL(tok->previous->str) << stringToLL(tok->next->str);
else if (tok->str == ">>")
result = stringToLL(tok->previous->str) >> stringToLL(tok->next->str);
else
continue;
tok = tok->previous;
tok->setstr(toString(result));
deleteToken(tok->next);
deleteToken(tok->next);
}
}
static const std::string NOTEQ("not_eq");
void simplecpp::TokenList::constFoldComparison(Token *tok)
{
@ -1193,6 +1220,7 @@ namespace simplecpp {
}
if (!sameline(nametoken, argtok)) {
endToken = argtok ? argtok->previous : argtok;
valueToken = NULL;
return false;
}
valueToken = argtok ? argtok->next : NULL;
@ -1259,8 +1287,8 @@ namespace simplecpp {
} else {
if (!expandArg(tokens, tok, tok->location, macros, expandedmacros, parametertokens)) {
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 std::map<TokenString, Macro>::const_iterator it = macros.find(tok->str);
if (it != macros.end() && expandedmacros.find(tok->str) == expandedmacros.end()) {
const Macro &m = it->second;
if (!m.functionLike()) {
m.expand(tokens, tok, macros, files);

1
externals/simplecpp/simplecpp.h vendored
View File

@ -249,6 +249,7 @@ namespace simplecpp {
void constFoldUnaryNotPosNeg(Token *tok);
void constFoldMulDivRem(Token *tok);
void constFoldAddSub(Token *tok);
void constFoldShift(Token *tok);
void constFoldComparison(Token *tok);
void constFoldBitwise(Token *tok);
void constFoldLogicalOp(Token *tok);