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

AST: improved handling for struct initialization 's = { [0] = 123 }'

This commit is contained in:
Daniel Marjamäki 2017-04-10 07:25:18 +02:00
parent d92c529aa6
commit ffeadbdde4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenlist.cpp
View File

@ -581,7 +581,11 @@ static void compileTerm(Token *&tok, AST_state& state)
tok = tok->next(); tok = tok->next();
if (state.inArrayAssignment && tok->str() == "." && Token::Match(tok->previous(), ",|{")) // Jump over . in C style struct initialization if (state.inArrayAssignment && tok->str() == "." && Token::Match(tok->previous(), ",|{")) // Jump over . in C style struct initialization
tok = tok->next(); tok = tok->next();
if (state.inArrayAssignment && Token::Match(tok->previous(), "[,{] [ %num% ]")) {
state.op.push(tok);
tok->astOperand1(tok->next());
tok = tok->tokAt(3);
}
if (tok->isLiteral()) { if (tok->isLiteral()) {
state.op.push(tok); state.op.push(tok);
do { do {

1
test/testtokenize.cpp
View File

@ -8070,6 +8070,7 @@ private:
ASSERT_EQUALS("tset{=", testAst("struct cgroup_taskset tset = {};")); ASSERT_EQUALS("tset{=", testAst("struct cgroup_taskset tset = {};"));
ASSERT_EQUALS("s1a&,{2b&,{,{=", testAst("s = { {1, &a}, {2, &b} };")); ASSERT_EQUALS("s1a&,{2b&,{,{=", testAst("s = { {1, &a}, {2, &b} };"));
TODO_ASSERT_EQUALS("xatoistr({(=", "x{(= atoistr(", testAst("x = (struct X){atoi(str)};")); TODO_ASSERT_EQUALS("xatoistr({(=", "x{(= atoistr(", testAst("x = (struct X){atoi(str)};"));
ASSERT_EQUALS("s0[L.2[x={=", testAst("s = { [0].L[2] = x};"));
// struct initialization hang // struct initialization hang
ASSERT_EQUALS("sbar1{,{(={= fcmd( forfieldfield++;;(", ASSERT_EQUALS("sbar1{,{(={= fcmd( forfieldfield++;;(",