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

Fix last of the -Wshadow warnings.

This commit is contained in:
Reijo Tomperi 2010-04-11 14:49:50 +03:00
parent 1f022e281f
commit d1f22d50e6
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/checkstl.cpp
View File

@ -368,11 +368,11 @@ void CheckStl::pushback()
if (Token::Match(tok2, "%varid% = %var% . begin ( ) ; %varid% != %var% . end ( ) ; ++| %varid% ++| ) {", iteratorid)) if (Token::Match(tok2, "%varid% = %var% . begin ( ) ; %varid% != %var% . end ( ) ; ++| %varid% ++| ) {", iteratorid))
{ {
const unsigned int vectorid(tok2->tokAt(2)->varId()); const unsigned int varId(tok2->tokAt(2)->varId());
if (vectorid == 0) if (varId == 0)
continue; continue;
const Token *pushback = 0; const Token *pushbackTok = 0;
unsigned int indent3 = 0; unsigned int indent3 = 0;
for (const Token *tok3 = tok2->tokAt(20); tok3; tok3 = tok3->next()) for (const Token *tok3 = tok2->tokAt(20); tok3; tok3 = tok3->next())
{ {
@ -386,17 +386,17 @@ void CheckStl::pushback()
} }
else if (tok3->str() == "break") else if (tok3->str() == "break")
{ {
pushback = 0; pushbackTok = 0;
break; break;
} }
else if (Token::Match(tok3, "%varid% . push_front|push_back|insert (", vectorid)) else if (Token::Match(tok3, "%varid% . push_front|push_back|insert (", varId))
{ {
pushback = tok3->tokAt(2); pushbackTok = tok3->tokAt(2);
} }
} }
if (pushback) if (pushbackTok)
invalidIteratorError(pushback, pushback->str(), tok2->strAt(0)); invalidIteratorError(pushbackTok, pushbackTok->str(), tok2->strAt(0));
} }
// Assigning iterator.. // Assigning iterator..

76
lib/tokenize.cpp
View File

@ -974,24 +974,24 @@ void Tokenizer::simplifyTypedef()
tok2->insertToken("("); tok2->insertToken("(");
tok2 = tok2->next(); tok2 = tok2->next();
tok3 = tok2; tok3 = tok2;
Token * nextToken; Token * nextArgTok;
std::stack<Token *> links; std::stack<Token *> argLinks;
for (nextToken = argStart->next(); nextToken != argEnd; nextToken = nextToken->next()) for (nextArgTok = argStart->next(); nextArgTok != argEnd; nextArgTok = nextArgTok->next())
{ {
tok2->insertToken(nextToken->strAt(0)); tok2->insertToken(nextArgTok->strAt(0));
tok2 = tok2->next(); tok2 = tok2->next();
// Check for links and fix them up // Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[") if (tok2->str() == "(" || tok2->str() == "[")
links.push(tok2); argLinks.push(tok2);
if (tok2->str() == ")" || tok2->str() == "]") if (tok2->str() == ")" || tok2->str() == "]")
{ {
Token * link = links.top(); Token * link = argLinks.top();
tok2->link(link); tok2->link(link);
link->link(tok2); link->link(tok2);
links.pop(); argLinks.pop();
} }
} }
tok2->insertToken(")"); tok2->insertToken(")");
@ -1002,24 +1002,24 @@ void Tokenizer::simplifyTypedef()
if (arrayStart && arrayEnd) if (arrayStart && arrayEnd)
{ {
tok2 = tok2->next(); tok2 = tok2->next();
Token * nextToken; Token * nextArrTok;
std::stack<Token *> links; std::stack<Token *> arrLinks;
for (nextToken = arrayStart; nextToken != arrayEnd->next(); nextToken = nextToken->next()) for (nextArrTok = arrayStart; nextArrTok != arrayEnd->next(); nextArrTok = nextArrTok->next())
{ {
tok2->insertToken(nextToken->strAt(0)); tok2->insertToken(nextArrTok->strAt(0));
tok2 = tok2->next(); tok2 = tok2->next();
// Check for links and fix them up // Check for links and fix them up
if (tok2->str() == "(" || tok2->str() == "[") if (tok2->str() == "(" || tok2->str() == "[")
links.push(tok2); arrLinks.push(tok2);
if (tok2->str() == ")" || tok2->str() == "]") if (tok2->str() == ")" || tok2->str() == "]")
{ {
Token * link = links.top(); Token * link = arrLinks.top();
tok2->link(link); tok2->link(link);
link->link(tok2); link->link(tok2);
links.pop(); arrLinks.pop();
} }
} }
tok2 = tok2->next(); tok2 = tok2->next();
@ -3848,26 +3848,26 @@ bool Tokenizer::simplifyQuestionMark()
} }
int ind = 0; int ind = 0;
for (const Token *end = semicolon; end; end = end->next()) for (const Token *endTok = semicolon; endTok; endTok = endTok->next())
{ {
if (end->str() == ";") if (endTok->str() == ";")
{ {
Token::eraseTokens(semicolon->previous(), end->next()); Token::eraseTokens(semicolon->previous(), endTok->next());
ret = true; ret = true;
break; break;
} }
else if (Token::Match(end, "[({[]")) else if (Token::Match(endTok, "[({[]"))
{ {
++ind; ++ind;
} }
else if (Token::Match(end, "[)}]]")) else if (Token::Match(endTok, "[)}]]"))
{ {
--ind; --ind;
if (ind < 0) if (ind < 0)
{ {
Token::eraseTokens(semicolon->previous(), end); Token::eraseTokens(semicolon->previous(), endTok);
ret = true; ret = true;
break; break;
} }
@ -5321,13 +5321,13 @@ void Tokenizer::simplifyGoto()
{ {
// Is this label at the end.. // Is this label at the end..
bool end = false; bool end = false;
int lev = 0; int level = 0;
for (const Token *tok2 = tok->tokAt(2); tok2; tok2 = tok2->next()) for (const Token *tok2 = tok->tokAt(2); tok2; tok2 = tok2->next())
{ {
if (tok2->str() == "}") if (tok2->str() == "}")
{ {
--lev; --level;
if (lev < 0) if (level < 0)
{ {
end = true; end = true;
break; break;
@ -5335,7 +5335,7 @@ void Tokenizer::simplifyGoto()
} }
else if (tok2->str() == "{") else if (tok2->str() == "{")
{ {
++lev; ++level;
} }
if (Token::Match(tok2, "%var% :") || tok2->str() == "goto") if (Token::Match(tok2, "%var% :") || tok2->str() == "goto")
@ -5779,7 +5779,7 @@ void Tokenizer::simplifyEnum()
bool exitThisScope = false; bool exitThisScope = false;
int exitScope = 0; int exitScope = 0;
bool simplifyEnum = false; bool simplify = false;
bool hasClass = false; bool hasClass = false;
for (Token *tok2 = tok1->next(); tok2; tok2 = tok2->next()) for (Token *tok2 = tok1->next(); tok2; tok2 = tok2->next())
{ {
@ -5801,7 +5801,7 @@ void Tokenizer::simplifyEnum()
} }
else if (!pattern.empty() && Token::Match(tok2, pattern.c_str())) else if (!pattern.empty() && Token::Match(tok2, pattern.c_str()))
{ {
simplifyEnum = true; simplify = true;
hasClass = true; hasClass = true;
} }
else if (inScope && !exitThisScope && tok2->str() == enumName->str()) else if (inScope && !exitThisScope && tok2->str() == enumName->str())
@ -5813,7 +5813,7 @@ void Tokenizer::simplifyEnum()
} }
else if (!duplicateDefinition(&tok2, enumName)) else if (!duplicateDefinition(&tok2, enumName))
{ {
simplifyEnum = true; simplify = true;
hasClass = false; hasClass = false;
} }
else else
@ -5823,7 +5823,7 @@ void Tokenizer::simplifyEnum()
} }
} }
if (simplifyEnum) if (simplify)
{ {
if (enumValue) if (enumValue)
tok2->str(enumValue->strAt(0)); tok2->str(enumValue->strAt(0));
@ -5860,7 +5860,7 @@ void Tokenizer::simplifyEnum()
tok2->deleteNext(); tok2->deleteNext();
} }
simplifyEnum = false; simplify = false;
} }
} }
} }
@ -5869,11 +5869,11 @@ void Tokenizer::simplifyEnum()
// check for a variable definition: enum {} x; // check for a variable definition: enum {} x;
if (end->next()->str() != ";") if (end->next()->str() != ";")
{ {
Token * tok = end; Token * tempTok = end;
tok->insertToken(";"); tempTok->insertToken(";");
tok = tok->next(); tempTok = tempTok->next();
tok->insertToken("int"); tempTok->insertToken("int");
} }
if (enumType) if (enumType)
@ -5884,7 +5884,7 @@ void Tokenizer::simplifyEnum()
bool exitThisScope = false; bool exitThisScope = false;
int exitScope = 0; int exitScope = 0;
bool simplifyEnum = false; bool simplify = false;
bool hasClass = false; bool hasClass = false;
for (Token *tok2 = end->next(); tok2; tok2 = tok2->next()) for (Token *tok2 = end->next(); tok2; tok2 = tok2->next())
{ {
@ -5904,7 +5904,7 @@ void Tokenizer::simplifyEnum()
++level; ++level;
else if (!pattern.empty() && ((Token::Match(tok2, "enum") && Token::Match(tok2->next(), pattern.c_str())) || Token::Match(tok2, pattern.c_str()))) else if (!pattern.empty() && ((Token::Match(tok2, "enum") && Token::Match(tok2->next(), pattern.c_str())) || Token::Match(tok2, pattern.c_str())))
{ {
simplifyEnum = true; simplify = true;
hasClass = true; hasClass = true;
} }
else if (inScope && !exitThisScope && (tok2->str() == enumType->str() || (tok2->str() == "enum" && tok2->next()->str() == enumType->str()))) else if (inScope && !exitThisScope && (tok2->str() == enumType->str() || (tok2->str() == "enum" && tok2->next()->str() == enumType->str())))
@ -5915,12 +5915,12 @@ void Tokenizer::simplifyEnum()
} }
else if (tok2->next() && tok2->next()->isName()) else if (tok2->next() && tok2->next()->isName())
{ {
simplifyEnum = true; simplify = true;
hasClass = false; hasClass = false;
} }
} }
if (simplifyEnum) if (simplify)
{ {
if (tok2->str() == "enum") if (tok2->str() == "enum")
tok2->deleteNext(); tok2->deleteNext();
@ -5932,7 +5932,7 @@ void Tokenizer::simplifyEnum()
tok2->deleteNext(); tok2->deleteNext();
} }
simplifyEnum = false; simplify = false;
} }
} }
} }