forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed more errors

This commit is contained in:
Hackerpilot 2013-04-28 14:34:54 -07:00
parent d5051c5807
commit 232b13cf62
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
D.g4
View File

@ -237,7 +237,7 @@ fragment DecimalInteger: DecimalDigit (DecimalDigit | '_')*;
fragment BinaryInteger: ('0b' | '0B') BinDigit (BinDigit | '_')*; fragment BinaryInteger: ('0b' | '0B') BinDigit (BinDigit | '_')*;
fragment HexadecimalInteger: ('0x' | '0X') HexDigit (HexDigit | '_')*; fragment HexadecimalInteger: ('0x' | '0X') HexDigit (HexDigit | '_')*;
FloatLiteral: (FloatOption FloatSuffix?) | (Integer (FloatSuffix | RealSuffix)? ImaginarySuffix); FloatLiteral: (FloatOption (FloatSuffix | RealSuffix)?) | (Integer (FloatSuffix | RealSuffix)? ImaginarySuffix);
fragment FloatOption: DecimalFloat | HexFloat; fragment FloatOption: DecimalFloat | HexFloat;
fragment DecimalFloat: (DecimalInteger '.' DecimalDigit*); /* BUG: can't lex a[0..1] properly */ fragment DecimalFloat: (DecimalInteger '.' DecimalDigit*); /* BUG: can't lex a[0..1] properly */
fragment DecimalExponent: ('e' | 'E' | 'e+' | 'E+' | 'e-' | 'E-') DecimalInteger; fragment DecimalExponent: ('e' | 'E' | 'e+' | 'E+' | 'e-' | 'E-') DecimalInteger;
@ -277,6 +277,7 @@ declaration: attributedDeclaration
| sharedStaticDestructor | sharedStaticDestructor
| sharedStaticConstructor | sharedStaticConstructor
| conditionalDeclaration | conditionalDeclaration
| pragmaDeclaration
; ;
importDeclaration: 'static'? 'import' importList ';' importDeclaration: 'static'? 'import' importList ';'
@ -375,7 +376,6 @@ nonEmptyStatementNoCaseNoDefault: labeledStatement
| throwStatement | throwStatement
| scopeGuardStatement | scopeGuardStatement
| asmStatement | asmStatement
| pragmaStatement
| foreachRangeStatement | foreachRangeStatement
| conditionalStatement | conditionalStatement
| staticAssertStatement | staticAssertStatement
@ -562,10 +562,10 @@ asmtypeprefix: Identifier Identifier
| 'real' Identifier | 'real' Identifier
; ;
pragmaStatement: pragma ';' pragmaDeclaration: pragmaExpression ';'
; ;
pragma: 'pragma' '(' Identifier (',' argumentList)? ')' pragmaExpression: 'pragma' '(' Identifier (',' argumentList)? ')'
; ;
foreachRangeStatement: 'foreach' '(' foreachType ';' expression '..' expression ')' nonEmptyStatementNoCaseNoDefault foreachRangeStatement: 'foreach' '(' foreachType ';' expression '..' expression ')' nonEmptyStatementNoCaseNoDefault
@ -1015,7 +1015,7 @@ typeConstructor: 'const'
typeof: 'typeof' '(' (expression | 'return') ')' typeof: 'typeof' '(' (expression | 'return') ')'
; ;
parameters: '(' (parameter (',' parameter)*)? ')' parameters: '(' ((parameter (',' parameter)*)? (',' '...')? | '...') ')'
; ;
parameter: parameterAttribute* type (Identifier? '...' | (Identifier ('=' defaultInitializerExpression)?))? parameter: parameterAttribute* type (Identifier? '...' | (Identifier ('=' defaultInitializerExpression)?))?
@ -1117,7 +1117,7 @@ attributedDeclaration: attribute (':' | declaration | '{' declaration* '}')
attribute: linkageattribute attribute: linkageattribute
| alignattribute | alignattribute
| pragma | pragmaExpression
| protectionAttribute | protectionAttribute
| 'deprecated' | 'deprecated'
| 'extern' | 'extern'