AST: fixed ast for 'new (char *)[10]'

danmar · danmar · commit aac9e661474a · 2014-10-12T12:57:01.000+02:00
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -665,11 +665,10 @@ static void compilePrecedence3(Token *&tok, AST_state& state)
                     tok = tok->link()->next();
                 if (Token::Match(tok->link(), ") ::| %type%"))
                     tok = tok->link()->next();
-                else if (Token::Match(tok, "( %type%") && Token::Match(tok->link(), ") [();,]")) {
+                else if (Token::Match(tok, "( %type%") && Token::Match(tok->link(), ") [();,[]")) {
                     tok = tok->next();
                     innertype = true;
-                }
-                else if (Token::Match(tok, "( &| %var%") && Token::simpleMatch(tok->link(), ") (")) {
+                } else if (Token::Match(tok, "( &| %var%") && Token::simpleMatch(tok->link(), ") (")) {
                     tok = tok->next();
                     innertype = true;
                 }
@@ -686,6 +685,10 @@ static void compilePrecedence3(Token *&tok, AST_state& state)
                 compileBinOp(tok, state, compilePrecedence2);
             } else if (tok->str() == "[" || tok->str() == "(")
                 compilePrecedence2(tok, state);
+            else if (innertype && Token::simpleMatch(tok, ") [")) {
+                tok = tok->next();
+                compilePrecedence2(tok, state);
+            }
             compileUnaryOp(newtok, state, nullptr);
             if (innertype && Token::simpleMatch(tok, ") ,"))
                 tok = tok->next();
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -8405,6 +8405,9 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("intp* pnew malloc4(", testAst("int*p; new (p) (malloc(4));"));
         ASSERT_EQUALS("intnew", testAst("new (&w.x)(int*)(0);"));
         ASSERT_EQUALS("&new", testAst("new (&w.x)(0);")); // <- the "(int*)" has been simplified
+
+        // gcc testsuite..
+        ASSERT_EQUALS("char10[new(", testAst("(void)new(char*)[10];"));
     }
 
     void astpar() const { // parentheses

Original file line number	Diff line number	Diff line change
`@@ -8405,6 +8405,9 @@ class TestTokenizer : public TestFixture {`
`8405`	`8405`	`ASSERT_EQUALS("intp* pnew malloc4(", testAst("int*p; new (p) (malloc(4));"));`
`8406`	`8406`	`ASSERT_EQUALS("intnew", testAst("new (&w.x)(int*)(0);"));`
`8407`	`8407`	`ASSERT_EQUALS("&new", testAst("new (&w.x)(0);")); // <- the "(int*)" has been simplified`
	`8408`	`+`
	`8409`	`+ // gcc testsuite..`
	`8410`	`+ ASSERT_EQUALS("char10[new(", testAst("(void)new(char*)[10];"));`
`8408`	`8411`	`}`
`8409`	`8412`
`8410`	`8413`	`void astpar() const { // parentheses`