AST: more fixes of new statements in clang test suite. some of it is not handled very well.

danmar · danmar · commit 489fc6cce765 · 2014-10-11T13:20:48.000+02:00
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -660,12 +660,14 @@ static void compilePrecedence3(Token *&tok, AST_state& state)
             Token* newtok = tok;
             tok = tok->next();
             if (tok->str() == "(") {
-                if (Token::Match(tok, "( %var% ) ( %type%") && Token::simpleMatch(tok->link()->linkAt(1), ") ("))
+                if (Token::Match(tok, "( &| %var%") && Token::Match(tok->link(), ") ( %type%") && Token::simpleMatch(tok->link()->linkAt(1), ") ("))
                     tok = tok->link()->next();
                 if (Token::Match(tok->link(), ") %type%"))
                     tok = tok->link()->next();
                 else if (Token::Match(tok, "( %type%") && Token::Match(tok->link(), ") [(;]"))
                     tok = tok->next();
+                else if (Token::Match(tok, "( &| %var%") && Token::simpleMatch(tok->link(), ") ("))
+                    tok = tok->next();
             }
             state.op.push(tok);
             while (Token::Match(tok, "%var%|*|&|<")) {
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -8391,6 +8391,9 @@ class TestTokenizer : public TestFixture {
         ASSERT_EQUALS("intnew", testAst("new (int S::*[3][4][5]) ();"));
         ASSERT_EQUALS("pSnew=", testAst("p=new (x)(S)(1,2);"));
         ASSERT_EQUALS("inti[new(", testAst("(void)new (int[i]);"));
+        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
     }
 
     void astpar() const { // parentheses

Original file line number	Diff line number	Diff line change
`@@ -8391,6 +8391,9 @@ class TestTokenizer : public TestFixture {`
`8391`	`8391`	`ASSERT_EQUALS("intnew", testAst("new (int S::*[3][4][5]) ();"));`
`8392`	`8392`	`ASSERT_EQUALS("pSnew=", testAst("p=new (x)(S)(1,2);"));`
`8393`	`8393`	`ASSERT_EQUALS("inti[new(", testAst("(void)new (int[i]);"));`
	`8394`	`+ ASSERT_EQUALS("intp* pnew malloc4(", testAst("int*p; new (p) (malloc(4));"));`
	`8395`	`+ ASSERT_EQUALS("intnew", testAst("new (&w.x)(int*)(0);"));`
	`8396`	`+ ASSERT_EQUALS("&new", testAst("new (&w.x)(0);")); // <- the "(int*)" has been simplified`
`8394`	`8397`	`}`
`8395`	`8398`
`8396`	`8399`	`void astpar() const { // parentheses`