Merge pull request #585 from 9rnsr/fix12740

Issue 12740 - DMD accepts invalid version syntax
dlang · May 29, 2014 · 91ae601 · 91ae601
2 parents b1fec9f + e019100
commit 91ae601
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/grammar.dd b/grammar.dd
@@ -1597,6 +1597,7 @@ $(GNAME ConditionalDeclaration):
     $(GLINK Condition) $(GLINK DeclarationBlock)
     $(GLINK Condition) $(GLINK DeclarationBlock) $(D else) $(GLINK DeclarationBlock)
     $(GLINK Condition) $(D :) $(GLINK DeclDefs)$(OPT)
+    $(GLINK Condition) $(GLINK DeclarationBlock) $(D else) $(D :) $(GLINK DeclDefs)$(OPT)
 
 $(GNAME ConditionalStatement):
     $(GLINK Condition) $(GLINK NoScopeNonEmptyStatement)

diff --git a/version.dd b/version.dd
@@ -13,6 +13,7 @@ $(GNAME ConditionalDeclaration):
     $(GLINK Condition) $(GLINK2 attribute, DeclarationBlock)
     $(GLINK Condition) $(GLINK2 attribute, DeclarationBlock) $(D else) $(GLINK2 attribute, DeclarationBlock)
     $(GLINK Condition) $(D :) $(GLINK2 module, DeclDefs)$(OPT)
+    $(GLINK Condition) $(GLINK2 attribute, DeclarationBlock) $(D else) $(D :) $(GLINK2 module, DeclDefs)$(OPT)
 
 $(GNAME ConditionalStatement):
     $(GLINK Condition) $(GLINK2 statement, NoScopeNonEmptyStatement)