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

Fixed #8844 (snd: Wrong varid and ast)

This commit is contained in:
Daniel Marjamäki 2018-11-14 21:05:03 +01:00
parent 69f2e0938a
commit 5d086d60ad
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/tokenlist.cpp
View File

@ -414,10 +414,15 @@ static bool iscast(const Token *tok)
bool type = false;
for (const Token *tok2 = tok->next(); tok2; tok2 = tok2->next()) {
if (tok2->varId() != 0)
return false;
while (tok2->link() && Token::Match(tok2, "(|[|<"))
tok2 = tok2->link()->next();
if (tok2->str() == ")") {
if (Token::simpleMatch(tok2, ") (") && Token::simpleMatch(tok2->linkAt(1), ") ."))
return true;
return type || tok2->strAt(-1) == "*" || Token::simpleMatch(tok2, ") ~") ||
(Token::Match(tok2, ") %any%") &&
!tok2->next()->isOp() &&
@ -757,17 +762,10 @@ static void compilePrecedence3(Token *&tok, AST_state& state)
}
compileUnaryOp(tok, state, compilePrecedence3);
} else if (tok->str() == "(" && iscast(tok)) {
Token* tok2 = tok;
Token* castTok = tok;
tok = tok->link()->next();
if (tok && tok->str() == "(" && !iscast(tok)) {
Token *tok3 = tok->next();
compileExpression(tok3, state);
if (tok->link() == tok3)
tok = tok3->next();
} else {
compilePrecedence3(tok, state);
}
compileUnaryOp(tok2, state, nullptr);
compilePrecedence3(tok, state);
compileUnaryOp(castTok, state, nullptr);
} else if (state.cpp && Token::Match(tok, "new %name%|::|(")) {
Token* newtok = tok;
tok = tok->next();

2
test/testtokenize.cpp
View File

@ -8536,6 +8536,8 @@ private:
ASSERT_EQUALS("xatoistr({(=", testAst("x = (struct X){atoi(str)};"));
ASSERT_EQUALS("xa.0=b.0=,c.0=,{(=", testAst("x = (struct abc) { .a=0, .b=0, .c=0 };"));
ASSERT_EQUALS("yz.(return", testAst("return (x)(y).z;"));
// not cast
ASSERT_EQUALS("AB||", testAst("(A)||(B)"));
ASSERT_EQUALS("abc[1&=", testAst("a = (b[c]) & 1;"));