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

Fixed #1361 (### Internal error in Cppcheck. Please report it)

This commit is contained in:
Daniel Marjamäki 2010-02-07 15:00:19 +01:00
parent fb09b2fd37
commit cd5b95849d
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tokenize.cpp
View File

@ -3102,7 +3102,15 @@ void Tokenizer::simplifyIfAddBraces()
++parlevel; ++parlevel;
else if (tempToken->str() == ")") else if (tempToken->str() == ")")
{
if (parlevel == 0)
{
tok->deleteThis();
tempToken = 0;
break;
}
--parlevel; --parlevel;
}
else if (indentlevel == 0 && parlevel == 0 && tempToken->str() == ";") else if (indentlevel == 0 && parlevel == 0 && tempToken->str() == ";")
break; break;

9
test/testtokenize.cpp
View File

@ -70,6 +70,7 @@ private:
TEST_CASE(ifAddBraces6); TEST_CASE(ifAddBraces6);
TEST_CASE(ifAddBraces7); TEST_CASE(ifAddBraces7);
TEST_CASE(ifAddBraces9); TEST_CASE(ifAddBraces9);
TEST_CASE(ifAddBraces10);
TEST_CASE(whileAddBraces); TEST_CASE(whileAddBraces);
TEST_CASE(doWhileAddBraces); TEST_CASE(doWhileAddBraces);
@ -623,6 +624,14 @@ private:
ASSERT_EQUALS(expected, tokenizeAndStringify(code, true)); ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
} }
void ifAddBraces10()
{
// ticket #1361
const char code[] = "{ DEBUG(if (x) y; else z); }";
const char expected[] = "{ DEBUG ( if ( x ) y ; else z ) ; }";
ASSERT_EQUALS(expected, tokenizeAndStringify(code, true));
}
void whileAddBraces() void whileAddBraces()
{ {
{ {