annotation before package could not be parsed

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4754 51baf565-9d33-0410-a72c-fc3788e3496d
2006-10-27 00:59:54 +00:00
parent 75664112cf
commit 21ba3d8e22
2 changed files with 1693 additions and 1661 deletions
--- a/pmd/etc/grammar/Java.jjt
+++ b/pmd/etc/grammar/Java.jjt
@ -1057,7 +1057,7 @@ TOKEN :
 ASTCompilationUnit CompilationUnit() :
 {}
 {
-  [ PackageDeclaration() ]
+  [ LOOKAHEAD( ( Annotation() )* "package" ) PackageDeclaration() ]
  ( ImportDeclaration() )*
  ( TypeDeclaration() )*
  ( < "\u001a" > )?
@ -1071,7 +1071,7 @@ ASTCompilationUnit CompilationUnit() :
 void PackageDeclaration() :
 {}
 {
-  "package" Name() ";"
+  ( Annotation() )* "package" Name() ";"
 }

 void ImportDeclaration() :
--- a/pmd/src/net/sourceforge/pmd/ast/JavaParser.java
+++ b/pmd/src/net/sourceforge/pmd/ast/JavaParser.java