From a53f8319f8b57f4d849f9dac963eba7160b6f8b1 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Sun, 28 Apr 2013 16:15:50 +0000
Subject: [PATCH] Fixed import declaarations and deprecation attributes

---
 D.g4 | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/D.g4 b/D.g4
index f431b43..bdc95a9 100644
--- a/D.g4
+++ b/D.g4
@@ -290,10 +290,7 @@ importList: singleImport (',' importList)?
 singleImport: (Identifier '=')? identifierChain
     ;
 
-importBindings: singleImport ':' importBindList
-    ;
-
-importBindList: importBind (',' importBind)?
+importBindings: singleImport ':' importBind (',' importBind)*
     ;
 
 importBind: Identifier ('=' Identifier)?
@@ -427,8 +424,7 @@ gotoStatement: 'goto' (Identifier | 'default' | 'case' expression?) ';'
 withStatement: 'with' '(' (expression | symbol | templateInstance) ')' nonEmptyStatementNoCaseNoDefault
     ;
 
-synchronizedStatement: 'synchronized' nonEmptyStatementNoCaseNoDefault
-    | 'synchronized' '(' expression ')' nonEmptyStatementNoCaseNoDefault
+synchronizedStatement: 'synchronized' ('(' expression ')')? nonEmptyStatementNoCaseNoDefault
     ;
 
 tryStatement: 'try' nonEmptyStatementNoCaseNoDefault (catches | catches finally_ | finally_)
@@ -1119,7 +1115,7 @@ attribute: linkageattribute
     | alignattribute
     | pragmaExpression
     | protectionAttribute
-    | 'deprecated'
+    | deprecated
     | 'extern'
     | 'final'
     | 'synchronized'
@@ -1154,6 +1150,9 @@ protectionAttribute: 'private'
     | 'export'
     ;
 
+deprecated: 'deprecated' ('(' assignExpression ')')?
+    ;
+
 traitsExpression: '__traits' '(' Identifier ',' traitsArgument (',' traitsArgument)* ')'
     ;