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

Merge pull request #670 from Dmitry-Me/betterVariableName4 

Better variable name
This commit is contained in:
orbitcowboy 2015-09-04 11:15:47 +02:00
parent b49c5d7193 a87990901a
commit 721376c4c0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/symboldatabase.cpp
View File

@ -804,17 +804,17 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
scope->nestedList.push_back(&scopeList.back()); scope->nestedList.push_back(&scopeList.back());
scope = &scopeList.back(); scope = &scopeList.back();
} else if (Token::Match(tok, "if|for|while|catch|switch (") && Token::simpleMatch(tok->next()->link(), ") {")) { } else if (Token::Match(tok, "if|for|while|catch|switch (") && Token::simpleMatch(tok->next()->link(), ") {")) {
const Token *tok1 = tok->next()->link()->next(); const Token *scopeStartTok = tok->next()->link()->next();
if (tok->str() == "if") if (tok->str() == "if")
scopeList.push_back(Scope(this, tok, scope, Scope::eIf, tok1)); scopeList.push_back(Scope(this, tok, scope, Scope::eIf, scopeStartTok));
else if (tok->str() == "for") { else if (tok->str() == "for") {
scopeList.push_back(Scope(this, tok, scope, Scope::eFor, tok1)); scopeList.push_back(Scope(this, tok, scope, Scope::eFor, scopeStartTok));
} else if (tok->str() == "while") } else if (tok->str() == "while")
scopeList.push_back(Scope(this, tok, scope, Scope::eWhile, tok1)); scopeList.push_back(Scope(this, tok, scope, Scope::eWhile, scopeStartTok));
else if (tok->str() == "catch") { else if (tok->str() == "catch") {
scopeList.push_back(Scope(this, tok, scope, Scope::eCatch, tok1)); scopeList.push_back(Scope(this, tok, scope, Scope::eCatch, scopeStartTok));
} else // if (tok->str() == "switch") } else // if (tok->str() == "switch")
scopeList.push_back(Scope(this, tok, scope, Scope::eSwitch, tok1)); scopeList.push_back(Scope(this, tok, scope, Scope::eSwitch, scopeStartTok));
scope->nestedList.push_back(&scopeList.back()); scope->nestedList.push_back(&scopeList.back());
scope = &scopeList.back(); scope = &scopeList.back();
@ -822,7 +822,7 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
scope->checkVariable(tok->tokAt(2), Local, &settings->library); // check for variable declaration and add it to new scope if found scope->checkVariable(tok->tokAt(2), Local, &settings->library); // check for variable declaration and add it to new scope if found
else if (scope->type == Scope::eCatch) else if (scope->type == Scope::eCatch)
scope->checkVariable(tok->tokAt(2), Throw, &settings->library); // check for variable declaration and add it to new scope if found scope->checkVariable(tok->tokAt(2), Throw, &settings->library); // check for variable declaration and add it to new scope if found
tok = tok1; tok = scopeStartTok;
} else if (tok->str() == "{" && !tok->previous()->varId()) { } else if (tok->str() == "{" && !tok->previous()->varId()) {
if (tok->strAt(-1) == ")" && tok->linkAt(-1)->strAt(-1) == "]") { if (tok->strAt(-1) == ")" && tok->linkAt(-1)->strAt(-1) == "]") {
scopeList.push_back(Scope(this, tok->linkAt(-1)->linkAt(-1), scope, Scope::eLambda, tok)); scopeList.push_back(Scope(this, tok->linkAt(-1)->linkAt(-1), scope, Scope::eLambda, tok));