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

Fixed #7059 (AST: handle C++ initialization with {} better)

This commit is contained in:
Daniel Marjamäki 2015-10-18 13:43:39 +02:00
parent 8f07b2e440
commit 9bb2af1893
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/tokenlist.cpp
View File

@ -462,6 +462,28 @@ static bool iscast(const Token *tok)
return false; return false;
} }
// X{} X<Y>{} etc
static bool iscpp11init(const Token * const nameToken)
{
const Token *endtok = nullptr;
if (Token::Match(nameToken,"%name% {"))
endtok = nameToken->linkAt(1);
else if (Token::Match(nameToken,"%name% <") && Token::simpleMatch(nameToken->linkAt(1),"> {"))
endtok = nameToken->linkAt(1)->linkAt(1);
else
return false;
// There is no initialisation for example here: 'class Fred {};'
if (!Token::simpleMatch(endtok, "} ;"))
return true;
const Token *prev = nameToken;
while (Token::Match(prev, "%name%|::|:|<|>")) {
if (Token::Match(prev, "class|struct"))
return false;
prev = prev->previous();
}
return true;
}
static void compileUnaryOp(Token *&tok, AST_state& state, void(*f)(Token *&tok, AST_state& state)) static void compileUnaryOp(Token *&tok, AST_state& state, void(*f)(Token *&tok, AST_state& state))
{ {
Token *unaryop = tok; Token *unaryop = tok;
@ -528,9 +550,11 @@ static void compileTerm(Token *&tok, AST_state& state)
} else if (Token::Match(tok, "sizeof !!(")) { } else if (Token::Match(tok, "sizeof !!(")) {
compileUnaryOp(tok, state, compileExpression); compileUnaryOp(tok, state, compileExpression);
state.op.pop(); state.op.pop();
} else if (state.cpp && Token::Match(tok,"%name% {")) { } else if (state.cpp && iscpp11init(tok)) { // X{} X<Y>{} etc
state.op.push(tok); state.op.push(tok);
tok = tok->next(); tok = tok->next();
if (tok->str() == "<")
tok = tok->link()->next();
if (Token::simpleMatch(tok, "{ }")) if (Token::simpleMatch(tok, "{ }"))
compileUnaryOp(tok, state, compileExpression); compileUnaryOp(tok, state, compileExpression);
@ -969,7 +993,7 @@ static Token * createAstAtToken(Token *tok, bool cpp)
if (Token::simpleMatch(tok, "( {")) if (Token::simpleMatch(tok, "( {"))
return tok; return tok;
if (Token::Match(tok, "%type% <") && Token::Match(tok->linkAt(1), "> !!(")) if (Token::Match(tok, "%type% <") && !Token::Match(tok->linkAt(1), "> [({]"))
return tok->linkAt(1); return tok->linkAt(1);
if (tok->str() == "return" || !tok->previous() || Token::Match(tok, "%name% %op%|(|[|.|::|<|?") || Token::Match(tok->previous(), "[;{}] %cop%|++|--|( !!{")) { if (tok->str() == "return" || !tok->previous() || Token::Match(tok, "%name% %op%|(|[|.|::|<|?") || Token::Match(tok->previous(), "[;{}] %cop%|++|--|( !!{")) {

3
test/testtokenize.cpp
View File

@ -8174,8 +8174,11 @@ private:
// C++ initializer // C++ initializer
ASSERT_EQUALS("Class{", testAst("Class{};")); ASSERT_EQUALS("Class{", testAst("Class{};"));
ASSERT_EQUALS("Class12,{", testAst("Class{1,2};")); ASSERT_EQUALS("Class12,{", testAst("Class{1,2};"));
ASSERT_EQUALS("Class12,{", testAst("Class<X>{1,2};"));
ASSERT_EQUALS("abc{d:?=", testAst("a=b?c{}:d;")); ASSERT_EQUALS("abc{d:?=", testAst("a=b?c{}:d;"));
ASSERT_EQUALS("abc12,{d:?=", testAst("a=b?c{1,2}:d;")); ASSERT_EQUALS("abc12,{d:?=", testAst("a=b?c{1,2}:d;"));
ASSERT_EQUALS("abc{d:?=", testAst("a=b?c<X>{}:d;"));
ASSERT_EQUALS("abc12,{d:?=", testAst("a=b?c<X>{1,2}:d;"));
} }
void astbrackets() { // [] void astbrackets() { // []