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

Merge pull request #202 from simartin/ticket_5214 

Ticket #5214: Added test case (ticket already fixed in mainline).
This commit is contained in:
Daniel Marjamäki 2013-12-23 02:49:25 -08:00
parent 76b907fe65 02dc49624d
commit e747b6c49b
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/tokenize.cpp
View File

@ -2566,6 +2566,8 @@ static Token *skipTernaryOp(Token *tok)
if (Token::Match(tok->next(), "[{};]")) if (Token::Match(tok->next(), "[{};]"))
break; break;
} }
if (colonlevel) // Ticket #5214: Make sure the ':' matches the proper '?'
return 0;
return tok; return tok;
} }
@ -2606,7 +2608,12 @@ bool Tokenizer::simplifyLabelsCaseDefault()
if (tok->str() == "(" || tok->str() == "[") { if (tok->str() == "(" || tok->str() == "[") {
tok = tok->link(); tok = tok->link();
} else if (tok->str() == "?") { } else if (tok->str() == "?") {
tok = skipTernaryOp(tok); Token *tok1 = skipTernaryOp(tok);
if(!tok1) {
syntaxError(tok);
return false;
}
tok = tok1;
} }
if (Token::Match(tok->next(),"[:{};]")) if (Token::Match(tok->next(),"[:{};]"))
break; break;

6
test/testtokenize.cpp
View File

@ -75,6 +75,7 @@ private:
TEST_CASE(garbageCode3); // #4869 TEST_CASE(garbageCode3); // #4869
TEST_CASE(garbageCode4); // #4887 TEST_CASE(garbageCode4); // #4887
TEST_CASE(garbageCode5); // #5168 TEST_CASE(garbageCode5); // #5168
TEST_CASE(garbageCode6); // #5214
TEST_CASE(simplifyFileAndLineMacro); // tokenize "return - __LINE__;" TEST_CASE(simplifyFileAndLineMacro); // tokenize "return - __LINE__;"
@ -981,6 +982,11 @@ private:
void garbageCode5() { // #5168 void garbageCode5() { // #5168
tokenizeAndStringify("( asm : ; void : );"); tokenizeAndStringify("( asm : ; void : );");
} }
void garbageCode6() { // #5214
tokenizeAndStringify("int b = ( 0 ? ? ) 1 : 0 ;", /*simplify=*/true);
tokenizeAndStringify("int a = int b = ( 0 ? ? ) 1 : 0 ;", /*simplify=*/true);
}
void simplifyFileAndLineMacro() { // tokenize 'return - __LINE__' correctly void simplifyFileAndLineMacro() { // tokenize 'return - __LINE__' correctly
ASSERT_EQUALS("\"test.cpp\"", tokenizeAndStringify("__FILE__")); ASSERT_EQUALS("\"test.cpp\"", tokenizeAndStringify("__FILE__"));