Merge pull request #2315 from guwirth/fix-2314

fix placement new issue

Author: guwirth

cxx-squid/src/main/java/org/sonar/cxx/parser/CxxGrammarImpl.java

@@ -766,16 +766,13 @@ private static void expressions(LexerfulGrammarBuilder b) {
           "gcnew" // C++/CLI
         ),
         b.firstOf(
-          b.sequence("(", typeId, ")"), // syntax sugar (todo)
-          b.sequence(
-            b.optional(newPlacement),
-            b.firstOf(
-              newTypeId, // C++
-              b.sequence("(", typeId, ")") // C++
-            ),
-            b.optional(newInitializer) // C++
-          )
-        )
+          // PEG: different order
+          b.sequence(newPlacement, "(", typeId, ")"), // C++
+          b.sequence(newPlacement, newTypeId), // C++
+          b.sequence("(", typeId, ")"), // C++
+          newTypeId // C++
+        ),
+        b.optional(newInitializer) // C++
       )
     );
 

cxx-squid/src/test/java/org/sonar/cxx/parser/ExpressionTest.java

@@ -404,7 +404,16 @@ public void newExpression_reallife() {
     assertThatParser()
       .matches("new Table()")
       .matches("new Table")
-      .matches("new(Table)");
+      .matches("new(Table)")
+      .matches("new double[n][5]")
+      .matches("new (int (*[10])())")
+      .matches("new (std::nothrow) char[8]")
+      .matches("new A{1, 2}")
+      .matches("new auto('a')")
+      .matches("new double[]{1,2,3}")
+      .matches("new std::integral auto(1)")
+      .matches("new(buf) T")
+      .matches("::new(p)A(1,2,3)");
   }
 
   @Test