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

Fixed #9531 (Syntax Error: AST broken, 'for' doesn't have two operands.)

This commit is contained in:
Daniel Marjamäki 2020-04-19 17:00:08 +02:00
parent 3eced58301
commit 3c56ccc33f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenlist.cpp
View File

@ -484,7 +484,7 @@ static Token * skipDecl(Token *tok)
vartok = vartok->link(); vartok = vartok->link();
else else
return tok; return tok;
} else if (Token::Match(vartok, "%name% [:=]")) { } else if (Token::Match(vartok, "%var% [:=(]")) {
return vartok; return vartok;
} }
vartok = vartok->next(); vartok = vartok->next();

7
test/testtokenize.cpp
View File

@ -7484,10 +7484,11 @@ private:
ASSERT_EQUALS("fora0=a8<a++;;(", testAst("for(a=0;a<8;a++)")); ASSERT_EQUALS("fora0=a8<a++;;(", testAst("for(a=0;a<8;a++)"));
ASSERT_EQUALS("fori1=current0=,iNUM<=i++;;(", testAst("for(i = (1), current = 0; i <= (NUM); ++i)")); ASSERT_EQUALS("fori1=current0=,iNUM<=i++;;(", testAst("for(i = (1), current = 0; i <= (NUM); ++i)"));
ASSERT_EQUALS("foreachxy,((", testAst("for(each(x,y)){}")); // it's not well-defined what this ast should be ASSERT_EQUALS("foreachxy,((", testAst("for(each(x,y)){}")); // it's not well-defined what this ast should be
ASSERT_EQUALS("forvar1(;;(", testAst("for(int var(1);;)"));
ASSERT_EQUALS("forab:(", testAst("for (int a : b);")); ASSERT_EQUALS("forab:(", testAst("for (int a : b);"));
ASSERT_EQUALS("forab:(", testAst("for (int *a : b);")); ASSERT_EQUALS("forvarb:(", testAst("for (int *var : b);"));
ASSERT_EQUALS("forcd:(", testAst("for (a<b> c : d);")); ASSERT_EQUALS("forvard:(", testAst("for (a<b> var : d);"));
ASSERT_EQUALS("forde:(", testAst("for (a::b<c> d : e);")); ASSERT_EQUALS("forvare:(", testAst("for (a::b<c> var : e);"));
ASSERT_EQUALS("forx*0=yz;;(", testAst("for(*x=0;y;z)")); ASSERT_EQUALS("forx*0=yz;;(", testAst("for(*x=0;y;z)"));
ASSERT_EQUALS("forx0=y(8<z;;(", testAst("for (x=0;(int)y<8;z);")); ASSERT_EQUALS("forx0=y(8<z;;(", testAst("for (x=0;(int)y<8;z);"));
ASSERT_EQUALS("forab,c:(", testAst("for (auto [a,b]: c);")); ASSERT_EQUALS("forab,c:(", testAst("for (auto [a,b]: c);"));