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

Code refactoring

This commit is contained in:
Daniel Marjamäki 2017-11-03 11:41:32 +01:00
parent 02461753f3
commit 9b2936a66f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tokenize.cpp
View File

@ -9889,22 +9889,19 @@ void Tokenizer::SimplifyNamelessRValueReferences()
const Token *Tokenizer::findSQLBlockEnd(const Token *tokSQLStart) const const Token *Tokenizer::findSQLBlockEnd(const Token *tokSQLStart) const
{ {
const Token *tokSQLEnd = nullptr;
const Token *tokLastEnd = nullptr; const Token *tokLastEnd = nullptr;
for (const Token *tok = tokSQLStart->tokAt(2); tok != nullptr && tokSQLEnd == nullptr; tok = tok->next()) { for (const Token *tok = tokSQLStart->tokAt(2); tok != nullptr; tok = tok->next()) {
if (tokLastEnd == nullptr && tok->str() == ";") if (tokLastEnd == nullptr && tok->str() == ";")
tokLastEnd = tok; tokLastEnd = tok;
else if (tok->str() == "EXEC") { else if (tok->str() == "EXEC") {
if (Token::simpleMatch(tok->tokAt(-2), "END - EXEC ;")) if (Token::simpleMatch(tok->tokAt(-2), "END - EXEC ;"))
tokSQLEnd = tok->next(); return tok->next();
else return tokLastEnd;
tokSQLEnd = tokLastEnd;
break;
} }
else if (Token::Match(tok, "{|}|==|&&|!|&|^|<<|>>|++|+=|-=|/=|*=|>>=|<<=|->|::|~")) else if (Token::Match(tok, "{|}|==|&&|!|&|^|<<|>>|++|+=|-=|/=|*=|>>=|<<=|->|::|~"))
break; // We are obviously outside the SQL block break; // We are obviously outside the SQL block
} }
return tokSQLEnd ? tokSQLEnd : tokLastEnd; return tokLastEnd;
} }