Merge branch 'issue-208'

Closes #211 (rebased onto pmd/5.4.x)
2017-01-27 20:11:49 +01:00
parent bbc9abd4e2 5081c89763
commit 0ef09b2c0a
4 changed files with 24 additions and 1 deletions
--- a/pmd-java/etc/grammar/Java.jjt
+++ b/pmd-java/etc/grammar/Java.jjt
@ -1,4 +1,9 @@
 /**
+ * Allow local classes to carry more than one annotation.
+ * Bug #208
+ *
+ * Juan Martin Sotuyo Dodero 01/2017
+ *====================================================================
 * Change lookahead for AnnotationMethodDeclaration in AnnotationTypeMemberDeclaration.
 * Bug #206
 *
@ -1980,7 +1985,7 @@ void BlockStatement():
  ClassOrInterfaceDeclaration, but that seems like a hack that
  could break other things...
  */
-  LOOKAHEAD( [Annotation()] ["final"|"abstract"] "class") [Annotation()] ClassOrInterfaceDeclaration(0)
+  LOOKAHEAD( (Annotation())* ["final"|"abstract"] "class") (Annotation())* ClassOrInterfaceDeclaration(0)
 }

 void LocalVariableDeclaration() :