Use explicit groups so the ATN can collapse sets

This commit is contained in:
Sam Harwell 2013-05-18 11:01:14 -05:00
parent 0e5bcc2416
commit 62cbab4f86
2 changed files with 42 additions and 38 deletions

View File

@ -211,13 +211,14 @@ classOrInterfaceModifiers
classOrInterfaceModifier classOrInterfaceModifier
: annotation // class or interface : annotation // class or interface
| 'public' // class or interface | ( 'public' // class or interface
| 'protected' // class or interface | 'protected' // class or interface
| 'private' // class or interface | 'private' // class or interface
| 'abstract' // class or interface | 'abstract' // class or interface
| 'static' // class or interface | 'static' // class or interface
| 'final' // class only -- does not apply to interfaces | 'final' // class only -- does not apply to interfaces
| 'strictfp' // class or interface | 'strictfp' // class or interface
)
; ;
modifiers modifiers
@ -414,7 +415,7 @@ arrayInitializer
modifier modifier
: annotation : annotation
| 'public' | ( 'public'
| 'protected' | 'protected'
| 'private' | 'private'
| 'static' | 'static'
@ -425,6 +426,7 @@ modifier
| 'transient' | 'transient'
| 'volatile' | 'volatile'
| 'strictfp' | 'strictfp'
)
; ;
packageOrTypeName packageOrTypeName

View File

@ -208,13 +208,14 @@ classOrInterfaceModifiers
classOrInterfaceModifier classOrInterfaceModifier
: annotation // class or interface : annotation // class or interface
| 'public' // class or interface | ( 'public' // class or interface
| 'protected' // class or interface | 'protected' // class or interface
| 'private' // class or interface | 'private' // class or interface
| 'abstract' // class or interface | 'abstract' // class or interface
| 'static' // class or interface | 'static' // class or interface
| 'final' // class only -- does not apply to interfaces | 'final' // class only -- does not apply to interfaces
| 'strictfp' // class or interface | 'strictfp' // class or interface
)
; ;
modifiers modifiers
@ -411,7 +412,7 @@ arrayInitializer
modifier modifier
: annotation : annotation
| 'public' | ( 'public'
| 'protected' | 'protected'
| 'private' | 'private'
| 'static' | 'static'
@ -422,6 +423,7 @@ modifier
| 'transient' | 'transient'
| 'volatile' | 'volatile'
| 'strictfp' | 'strictfp'
)
; ;
packageOrTypeName packageOrTypeName