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

Changed simplifyConditionOperator() to create also {} around if and else 

Fixed validate() in tokenizer.
This commit is contained in:
Reijo Tomperi 2009-09-29 23:27:10 +03:00
parent e5bc4a02ae
commit 9d9d600d43
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tokenize.cpp
View File

@ -2087,9 +2087,9 @@ void Tokenizer::simplifyConditionOperator()
const std::string value1(tok->strAt(5)); const std::string value1(tok->strAt(5));
const std::string value2(tok->strAt(7)); const std::string value2(tok->strAt(7));
Token::eraseTokens(tok, tok->tokAt(8)); Token::eraseTokens(tok, tok->tokAt(9));
std::string str("if ( " + condition + " ) " + var + " = " + value1 + " ; else " + var + " = " + value2); std::string str("if ( " + condition + " ) { " + var + " = " + value1 + " ; } else { " + var + " = " + value2 + " ; }");
std::string::size_type pos1 = 0; std::string::size_type pos1 = 0;
while (pos1 != std::string::npos) while (pos1 != std::string::npos)
{ {
@ -2107,7 +2107,9 @@ void Tokenizer::simplifyConditionOperator()
tok = tok->next(); tok = tok->next();
} }
Token::createMutualLinks(tok->tokAt(-10), tok->tokAt(-8)); Token::createMutualLinks(tok->tokAt(-15), tok->tokAt(-13));
Token::createMutualLinks(tok->tokAt(-12), tok->tokAt(-7));
Token::createMutualLinks(tok->tokAt(-5), tok);
} }
} }
} }
@ -4051,14 +4053,14 @@ bool Tokenizer::validate() const
for (const Token *tok = tokens(); tok; tok = tok->next()) for (const Token *tok = tokens(); tok; tok = tok->next())
{ {
if (Token::Match(tok, "[{(]")) if (Token::Match(tok, "[{([]"))
{ {
assert(tok->link() != 0); assert(tok->link() != 0);
linktok.push(tok); linktok.push(tok);
continue; continue;
} }
else if (Token::Match(tok, "[})]")) else if (Token::Match(tok, "[})]]"))
{ {
assert(tok->link() != 0); assert(tok->link() != 0);
assert(linktok.empty() == false); assert(linktok.empty() == false);