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

astyle formatting 

[ci skip]
This commit is contained in:
Daniel Marjamäki 2018-05-11 21:25:41 +02:00
parent cf6e72b150
commit a3f1d28fa5
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/tokenize.cpp
View File

@ -6390,8 +6390,7 @@ bool Tokenizer::simplifyKnownVariables()
constantValues[vartok->varId()] = valuetok->str(); constantValues[vartok->varId()] = valuetok->str();
constantVars[vartok->varId()] = tok1; constantVars[vartok->varId()] = tok1;
} }
} } else if (tok->varId()) {
else if (tok->varId()) {
// find the entry for the known variable, if any. Exclude the location where the variable is assigned with next == "=" // find the entry for the known variable, if any. Exclude the location where the variable is assigned with next == "="
if (constantValues.find(tok->varId()) != constantValues.end() && tok->next()->str() != "=") { if (constantValues.find(tok->varId()) != constantValues.end() && tok->next()->str() != "=") {
constantValueUsages[tok->varId()].push_back(tok); constantValueUsages[tok->varId()].push_back(tok);
@ -6399,25 +6398,20 @@ bool Tokenizer::simplifyKnownVariables()
} }
} }
for (auto constantVar = constantVars.rbegin(); constantVar != constantVars.rend(); constantVar++) for (auto constantVar = constantVars.rbegin(); constantVar != constantVars.rend(); constantVar++) {
{
bool referenceFound = false; bool referenceFound = false;
std::list<Token*> usageList = constantValueUsages[constantVar->first]; std::list<Token*> usageList = constantValueUsages[constantVar->first];
for (Token* usage : usageList) for (Token* usage : usageList) {
{
// check if any usages of each known variable are a reference // check if any usages of each known variable are a reference
if (Token::Match(usage->tokAt(-2), "(|[|,|{|return|%op% & %varid%", constantVar->first)) if (Token::Match(usage->tokAt(-2), "(|[|,|{|return|%op% & %varid%", constantVar->first)) {
{
referenceFound = true; referenceFound = true;
break; break;
} }
} }
if (!referenceFound) if (!referenceFound) {
{
// replace all usages of non-referenced known variables with their value // replace all usages of non-referenced known variables with their value
for (Token* usage : usageList) for (Token* usage : usageList) {
{
usage->str(constantValues[constantVar->first]); usage->str(constantValues[constantVar->first]);
} }
@ -6426,8 +6420,8 @@ bool Tokenizer::simplifyKnownVariables()
while (startTok->next()->str() != ";") while (startTok->next()->str() != ";")
startTok->deleteNext(); startTok->deleteNext();
startTok->deleteNext(); startTok->deleteNext();
startTok->deleteThis(); startTok->deleteThis();
constantVar->second = nullptr; constantVar->second = nullptr;
ret = true; ret = true;
} }