Merge pull request #781 from 9rnsr/fix13941

Issue 13941 - NewExpression grammar is insufficient
dlang · Jan 18, 2015 · 3444368 · 3444368
2 parents 572f53d + 5e9be8f
commit 3444368
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/declaration.dd b/declaration.dd
@@ -78,8 +78,7 @@ $(GNAME AltFuncDeclaratorSuffix):
 
 $(GRAMMAR
 $(GNAME Type):
-    $(GLINK TypeCtors)$(OPT) $(GLINK BasicType)
-    $(GLINK TypeCtors)$(OPT) $(GLINK BasicType) $(GLINK AltDeclarator)
+    $(GLINK TypeCtors)$(OPT) $(GLINK BasicType) $(GLINK BasicType2)$(OPT)
 
 $(GNAME TypeCtors):
     $(GLINK TypeCtor)
@@ -126,6 +125,9 @@ $(MULTICOLS 5,
     $(D void))
 
 $(GNAME BasicType2):
+    $(GLINK BasicType2X) $(GLINK BasicType2)$(OPT)
+
+$(GNAME BasicType2X):
     $(D *)
     $(D [ ])
     $(D [) $(VEXPRESSION) $(D ])

diff --git a/grammar.dd b/grammar.dd
@@ -10,8 +10,7 @@ $(H3 $(LNAME2 type, Type))
 
 $(GRAMMAR
 $(GNAME Type):
-    $(GLINK TypeCtors)$(OPT) $(GLINK BasicType)
-    $(GLINK TypeCtors)$(OPT) $(GLINK BasicType) $(GLINK AltDeclarator)
+    $(GLINK TypeCtors)$(OPT) $(GLINK BasicType) $(GLINK BasicType2)$(OPT)
 
 $(GNAME TypeCtors):
     $(GLINK TypeCtor)
@@ -57,6 +56,9 @@ $(GNAME BasicTypeX):
     $(D void)
 
 $(GNAME BasicType2):
+    $(GLINK BasicType2X) $(GLINK BasicType2)$(OPT)
+
+$(GNAME BasicType2X):
     $(D *)
     $(D [ ])
     $(D [) $(ASSIGNEXPRESSION) $(D ])