Parse annotations on aspect-declared constructors

fixes #271 (bitbucket)

ChangeLog

@@ -6,6 +6,7 @@
     for each AST class.
     * NTAs declared in the abstract grammar will now always be cached,
     just like attribute-only NTAs.
+    * Allow user annotations on aspect constructor declarations.
 
 2016-10-24  Jesper Öqvist <jesper.oqvist@cs.lth.se>
 

src/javacc/jrag/Jrag.jjt

@@ -654,7 +654,7 @@ void AspectBodyDeclaration() :
   LOOKAHEAD( AspectMethodDeclarationLookahead() )
   AspectMethodDeclaration()
 |
-  LOOKAHEAD( [ "public" | "protected" | "private" ] <IDENTIFIER> "." <IDENTIFIER> "(" )
+  LOOKAHEAD( Modifiers() <IDENTIFIER> "." <IDENTIFIER> "(" )
   AspectConstructorDeclaration()
 |
   LOOKAHEAD( AspectFieldDeclarationLookahead() )
@@ -973,7 +973,7 @@ void AspectRefineMethodDeclaration() :
 void AspectConstructorDeclaration() :
 {Token t;}
 {
-  [ "public" | "protected" | "private" ]
+  Modifiers()
   t = <IDENTIFIER> "." { className = t.image; } <IDENTIFIER> FormalParameters() [ "throws" NameList() ]
   "{"
     [ LOOKAHEAD(ExplicitConstructorInvocation()) ExplicitConstructorInvocation() ]