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

AST: improved handling of casts

This commit is contained in:
Daniel Marjamäki 2013-11-11 16:39:34 +01:00
parent 347e1eae20
commit 58d7caded1
3 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkother.cpp
View File

@ -50,6 +50,8 @@ static bool isSameExpression(const Token *tok1, const Token *tok2, const std::se
else if (tok1->function() && !tok1->function()->isConst)
return false;
}
if (Token::Match(tok1, "++|--"))
return false;
if (!isSameExpression(tok1->astOperand1(), tok2->astOperand1(), constFunctions))
return false;
if (!isSameExpression(tok1->astOperand2(), tok2->astOperand2(), constFunctions))

44
lib/tokenlist.cpp
View File

@ -357,6 +357,21 @@ bool TokenList::createTokens(std::istream &code, const std::string& file0)
//---------------------------------------------------------------------------
static bool iscast(const Token *tok)
{
if (!Token::Match(tok, "( %var%"))
return false;
for (const Token *tok2 = tok->next(); tok2; tok2 = tok2->next()) {
if (tok2->str() == ")")
return (tok2->next() && !tok2->next()->isOp());
if (!Token::Match(tok2, "%var%|*"))
return false;
}
return false;
}
static void compileUnaryOp(Token *&tok, void (*f)(Token *&, std::stack<Token*> &), std::stack<Token*> &op)
{
Token *unaryop = tok;
@ -391,14 +406,19 @@ static void compileBinOp(Token *&tok, void (*f)(Token *&, std::stack<Token*> &),
op.push(binop);
}
static void compileDot(Token *&tok, std::stack<Token*> &op);
static void compileExpression(Token *&tok, std::stack<Token*> &op);
static void compileTerm(Token *& tok, std::stack<Token*> &op)
{
if (!tok)
return;
if (tok->isLiteral()) {
op.push(tok);
tok = tok->next();
} else if (Token::Match(tok, "+|-|~|*|&|!|return")) {
} else if (Token::Match(tok, "+|-|~|*|&|!")) {
compileUnaryOp(tok, compileDot, op);
} else if (tok->str() == "return") {
compileUnaryOp(tok, compileExpression, op);
} else if (tok->isName()) {
if (Token::Match(tok->next(), "++|--")) { // post increment / decrement
@ -435,13 +455,25 @@ static void compileTerm(Token *& tok, std::stack<Token*> &op)
tok = tok->next();
} else {
// pre increment/decrement
compileUnaryOp(tok, compileExpression, op);
compileUnaryOp(tok, compileDot, op);
}
} else if (tok->str() == "(") {
// Parenthesized sub-expression
tok = tok->next();
compileExpression(tok,op);
tok = tok->next();
if (iscast(tok)) {
Token *unaryop = tok;
tok = tok->link()->next();
compileDot(tok,op);
if (!op.empty()) {
unaryop->astOperand1(op.top());
op.pop();
}
op.push(unaryop);
} else {
// Parenthesized sub-expression
tok = tok->next();
compileExpression(tok,op);
tok = tok->next();
}
}
}

6
test/testtokenize.cpp
View File

@ -9961,6 +9961,8 @@ private:
ASSERT_EQUALS("ab::c+", testAst("a::b+c"));
ASSERT_EQUALS("abc+=", testAst("a=b+c"));
ASSERT_EQUALS("abc=,", testAst("a,b=c"));
ASSERT_EQUALS("a-1+", testAst("-a+1"));
ASSERT_EQUALS("ab++-c-", testAst("a-b++-c"));
ASSERT_EQUALS("a\"\"=", testAst("a=\"\""));
ASSERT_EQUALS("a\'\'=", testAst("a=\'\'"));
@ -9974,6 +9976,10 @@ private:
ASSERT_EQUALS("123+*", testAst("1*(2+3)"));
ASSERT_EQUALS("123+*4*", testAst("1*(2+3)*4"));
ASSERT_EQUALS("ifab.c&d==(", testAst("if((a.b&c)==d){}"));
// casts
ASSERT_EQUALS("a1(2(+=",testAst("a=(t)1+(t)2;"));
ASSERT_EQUALS("a1(2+=",testAst("a=(t)1+2;"));
}
void astbrackets() const { // []