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

Improve tokenizer: don't confuse between a label and the case/default statements.

This commit is contained in:
Edoardo Prezioso 2011-10-19 18:49:02 +02:00
parent 882b0c15a0
commit 9257e82475
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tokenize.cpp
View File

@ -7409,7 +7409,7 @@ void Tokenizer::simplifyGoto()
else if (Token::Match(tok, "goto %var% ;")) else if (Token::Match(tok, "goto %var% ;"))
gotos.push_back(tok); gotos.push_back(tok);
else if (indentlevel == 1 && Token::Match(tok->previous(), "[};] %var% : ;")) { else if (indentlevel == 1 && Token::Match(tok->previous(), "[{};] %var% : ;") && tok->str() != "default") {
// Is this label at the end.. // Is this label at the end..
bool end = false; bool end = false;
unsigned int level = 0; unsigned int level = 0;
@ -7435,7 +7435,7 @@ void Tokenizer::simplifyGoto()
++level; ++level;
} }
if (Token::Match(tok2, "%var% : ;") || tok2->str() == "goto") { if ((Token::Match(tok2->previous(), "[{};] %var% : ;") && tok2->str() != "default") || tok2->str() == "goto") {
break; break;
} }
} }
@ -8688,7 +8688,8 @@ void Tokenizer::simplifyWhile0()
// remove "while (0) { .. }" // remove "while (0) { .. }"
if (Token::simpleMatch(tok->next()->link(), ") {")) { if (Token::simpleMatch(tok->next()->link(), ") {")) {
const Token *end = tok->next()->link()->next()->link(); const Token *end = tok->next()->link()->next()->link();
if (!Token::findmatch(tok, "%var% : ;", end)) { const Token *labelmatch = Token::findmatch(tok, "[{};] %var% : ;", end);
if (!labelmatch || labelmatch->next()->str() == "default") {
Token::eraseTokens(tok, end ? end->next() : 0); Token::eraseTokens(tok, end ? end->next() : 0);
tok->deleteThis(); // delete "while" tok->deleteThis(); // delete "while"
} }

1
test/testsimplifytokens.cpp
View File

@ -6455,6 +6455,7 @@ private:
ASSERT_EQUALS("; { continue ; }", tok("; do { continue ; } while (0);")); ASSERT_EQUALS("; { continue ; }", tok("; do { continue ; } while (0);"));
ASSERT_EQUALS("; { break ; }", tok("; do { break; } while (0);")); ASSERT_EQUALS("; { break ; }", tok("; do { break; } while (0);"));
ASSERT_EQUALS(";", tok("; while (false) { a; }")); ASSERT_EQUALS(";", tok("; while (false) { a; }"));
ASSERT_EQUALS(";", tok("; while (false) { switch (n) { case 0: return; default: break; } n*=1; }"));
} }
void while0for() { void while0for() {