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

Fixed #2118 (Invalid syntax error report.)

This commit is contained in:
Daniel Marjamäki 2010-10-26 19:39:48 +02:00
parent 457fd822c0
commit 6200d4505a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -1876,7 +1876,7 @@ bool Tokenizer::tokenize(std::istream &code,
for (const Token *tok = _tokens; tok; tok = tok->next()) for (const Token *tok = _tokens; tok; tok = tok->next())
{ {
// skip executing scopes.. // skip executing scopes..
if (Token::Match(tok, ") const| {")) if (Token::Match(tok, ") const| {") || Token::simpleMatch(tok, ", {"))
{ {
while (tok->str() != "{") while (tok->str() != "{")
tok = tok->next(); tok = tok->next();

11
test/testtokenize.cpp
View File

@ -49,6 +49,7 @@ private:
TEST_CASE(tokenize9); TEST_CASE(tokenize9);
TEST_CASE(tokenize10); TEST_CASE(tokenize10);
TEST_CASE(tokenize11); TEST_CASE(tokenize11);
TEST_CASE(tokenize12);
// don't freak out when the syntax is wrong // don't freak out when the syntax is wrong
TEST_CASE(wrong_syntax); TEST_CASE(wrong_syntax);
@ -436,6 +437,16 @@ private:
ASSERT_EQUALS("X * sizeof ( Y ( ) ) ;", tokenizeAndStringify("X * sizeof(Y());", false)); ASSERT_EQUALS("X * sizeof ( Y ( ) ) ;", tokenizeAndStringify("X * sizeof(Y());", false));
} }
// ticket #2118 - invalid syntax error
void tokenize12()
{
tokenizeAndStringify("Q_GLOBAL_STATIC_WITH_INITIALIZER(Qt4NodeStaticData, qt4NodeStaticData, {\n"
" for (unsigned i = 0 ; i < count; i++) {\n"
" }\n"
"});");
ASSERT_EQUALS("", errout.str());
}
void wrong_syntax() void wrong_syntax()
{ {
{ {