Change grammar, so a comma is not part of a initializer list conflict

Author: tim-dlang

src/cppconv/grammarcpp.ebnf

@@ -1108,12 +1108,15 @@ InitializerClauseDesignator
 InitializerList @array
     = InitializerClauseDesignator
     | InitializerClauseDesignator "..."
-    | InitializerList "," InitializerClauseDesignator
-    | InitializerList "," InitializerClauseDesignator "..."
+    | InitializerListComma InitializerClauseDesignator
+    | InitializerListComma InitializerClauseDesignator "..."
+    ;
+InitializerListComma @array
+    = InitializerList ","
     ;
 InitializerList2 @array
     = InitializerList
-    | InitializerList ","
+    | InitializerListComma
     | @empty;
 DesignatorList @array
     = Designator

tests/single/testconflict_tl_f_2.d

@@ -29,13 +29,13 @@ void f()
     }
     ~ "("
     ~ q{
-        1, 2
+        1, 2,
     }
     ~ (!defined!"DEF" ? q{
-        , T1!(a, b) (c)
+         T1!(a, b) (c)
     }:"")
     ~ (defined!"DEF" ? q{
-        ,T1<a,b>(c)
+        T1<a,b>(c)
     }:"")
     ~ q{
         , 4, 5

tests/single/testconflict_tl_f_4.d

@@ -52,22 +52,23 @@ __gshared const(int) b = 3;
 void g()
 {
     S data = mixin("S(" ~ q{
-                1
+                1,
     }
     ~ (defined!"DEF" ? q{
-        ,
 
                 f!(a, b)(2)
     }:"")
     ~ (!defined!"DEF" ? q{
-        ,f<a,b>(2)
+        f<a,b>(2)
     }:"")
-    ~ (defined!"DEF" ? q{
+    ~ q{
         ,
+    }
+    ~ (defined!"DEF" ? q{
                 f!(a, b)(3)
     }:"")
     ~ (!defined!"DEF" ? q{
-        ,f<a,b>(3)
+        f<a,b>(3)
     }:"")
     ~ q{
         ,