8034245: Refactor TopLevel tree node

Added JCPackageDecl to JCTree to store package-level information.

Reviewed-by: jjg, jlahoda
This commit is contained in:
Paul Govereau 2014-04-22 17:07:54 -04:00
parent b349726850
commit 9783b65028
25 changed files with 293 additions and 145 deletions

View file

@ -144,7 +144,8 @@ public class DocCommentToplevelTest {
public ClassTree visitCompilationUnit(CompilationUnitTree node, Void unused) {
docComments = ((JCTree.JCCompilationUnit)node).docComments;
boolean expectedComment = tdk == ToplevelDocKind.HAS_DOC &&
(pk != PackageKind.NO_PKG || ik != ImportKind.ZERO);
pk == PackageKind.NO_PKG &&
ik != ImportKind.ZERO;
boolean foundComment = docComments.hasComment((JCTree) node);
if (expectedComment != foundComment) {
error("Unexpected comment " + docComments.getComment((JCTree) node) + " on toplevel");
@ -152,6 +153,17 @@ public class DocCommentToplevelTest {
return super.visitCompilationUnit(node, null);
}
@Override
public ClassTree visitPackage(PackageTree node, Void unused) {
boolean expectedComment = tdk == ToplevelDocKind.HAS_DOC &&
pk != PackageKind.NO_PKG;
boolean foundComment = docComments.hasComment((JCTree) node);
if (expectedComment != foundComment) {
error("Unexpected comment " + docComments.getComment((JCTree) node) + " on toplevel");
}
return super.visitPackage(node, null);
}
@Override
public ClassTree visitClass(ClassTree node, Void unused) {
boolean expectedComment = tdk == ToplevelDocKind.HAS_DOC &&