Fixed import declaarations and deprecation attributes

This commit is contained in:
Hackerpilot 2013-04-28 16:15:50 +00:00
parent 232b13cf62
commit a53f8319f8
1 changed files with 6 additions and 7 deletions

13
D.g4
View File

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