aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lombok/eclipse/EclipseAST.java146
-rw-r--r--src/lombok/javac/JavacAST.java150
2 files changed, 152 insertions, 144 deletions
diff --git a/src/lombok/eclipse/EclipseAST.java b/src/lombok/eclipse/EclipseAST.java
index e5489011..6c4ce211 100644
--- a/src/lombok/eclipse/EclipseAST.java
+++ b/src/lombok/eclipse/EclipseAST.java
@@ -46,81 +46,12 @@ public class EclipseAST extends AST<ASTNode> {
}
public void traverse(EclipseASTVisitor visitor) {
- Node current = top();
- visitor.visitCompilationUnit(current, (CompilationUnitDeclaration)current.get());
- traverseChildren(visitor, current);
- visitor.endVisitCompilationUnit(current, (CompilationUnitDeclaration)current.get());
+ top().traverse(visitor);
}
private void traverseChildren(EclipseASTVisitor visitor, Node node) {
for ( Node child : node.down() ) {
- ASTNode n = child.get();
- switch ( child.getKind() ) {
- case TYPE:
- visitor.visitType(child, (TypeDeclaration)n);
- traverseChildren(visitor, child);
- visitor.endVisitType(child, (TypeDeclaration)n);
- break;
- case FIELD:
- visitor.visitField(child, (FieldDeclaration)n);
- traverseChildren(visitor, child);
- visitor.endVisitField(child, (FieldDeclaration)n);
- break;
- case INITIALIZER:
- visitor.visitInitializer(child, (Initializer)n);
- traverseChildren(visitor, child);
- visitor.endVisitInitializer(child, (Initializer)n);
- break;
- case METHOD:
- if ( n instanceof Clinit ) continue;
- visitor.visitMethod(child, (AbstractMethodDeclaration)n);
- traverseChildren(visitor, child);
- visitor.endVisitMethod(child, (AbstractMethodDeclaration)n);
- break;
- case ARGUMENT:
- AbstractMethodDeclaration method = (AbstractMethodDeclaration)child.up().get();
- visitor.visitMethodArgument(child, (Argument)n, method);
- traverseChildren(visitor, child);
- visitor.endVisitMethodArgument(child, (Argument)n, method);
- break;
- case LOCAL:
- visitor.visitLocal(child, (LocalDeclaration)n);
- traverseChildren(visitor, child);
- visitor.endVisitLocal(child, (LocalDeclaration)n);
- break;
- case ANNOTATION:
- Node parent = child.up();
- switch ( parent.getKind() ) {
- case TYPE:
- visitor.visitAnnotationOnType((TypeDeclaration)parent.get(), child, (Annotation)n);
- break;
- case FIELD:
- visitor.visitAnnotationOnField((FieldDeclaration)parent.get(), child, (Annotation)n);
- break;
- case METHOD:
- visitor.visitAnnotationOnMethod((AbstractMethodDeclaration)parent.get(), child, (Annotation)n);
- break;
- case ARGUMENT:
- visitor.visitAnnotationOnMethodArgument(
- (Argument)parent.get(),
- (AbstractMethodDeclaration)parent.directUp().get(),
- child, (Annotation)n);
- break;
- case LOCAL:
- visitor.visitAnnotationOnLocal((LocalDeclaration)parent.get(), child, (Annotation)n);
- break;
- default:
- throw new AssertionError("Annotion not expected as child of a " + parent.getKind());
- }
- break;
- case STATEMENT:
- visitor.visitStatement(child, (Statement)n);
- traverseChildren(visitor, child);
- visitor.endVisitStatement(node, (Statement)n);
- break;
- default:
- throw new AssertionError("Unexpected kind during child traversal: " + child.getKind());
- }
+ child.traverse(visitor);
}
}
@@ -198,6 +129,79 @@ public class EclipseAST extends AST<ASTNode> {
super(node, children, kind);
}
+ public void traverse(EclipseASTVisitor visitor) {
+ switch ( getKind() ) {
+ case COMPILATION_UNIT:
+ visitor.visitCompilationUnit(this, (CompilationUnitDeclaration)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitCompilationUnit(this, (CompilationUnitDeclaration)get());
+ break;
+ case TYPE:
+ visitor.visitType(this, (TypeDeclaration)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitType(this, (TypeDeclaration)get());
+ break;
+ case FIELD:
+ visitor.visitField(this, (FieldDeclaration)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitField(this, (FieldDeclaration)get());
+ break;
+ case INITIALIZER:
+ visitor.visitInitializer(this, (Initializer)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitInitializer(this, (Initializer)get());
+ break;
+ case METHOD:
+ if ( get() instanceof Clinit ) return;
+ visitor.visitMethod(this, (AbstractMethodDeclaration)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitMethod(this, (AbstractMethodDeclaration)get());
+ break;
+ case ARGUMENT:
+ AbstractMethodDeclaration method = (AbstractMethodDeclaration)up().get();
+ visitor.visitMethodArgument(this, (Argument)get(), method);
+ traverseChildren(visitor, this);
+ visitor.endVisitMethodArgument(this, (Argument)get(), method);
+ break;
+ case LOCAL:
+ visitor.visitLocal(this, (LocalDeclaration)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitLocal(this, (LocalDeclaration)get());
+ break;
+ case ANNOTATION:
+ switch ( up().getKind() ) {
+ case TYPE:
+ visitor.visitAnnotationOnType((TypeDeclaration)up().get(), this, (Annotation)get());
+ break;
+ case FIELD:
+ visitor.visitAnnotationOnField((FieldDeclaration)up().get(), this, (Annotation)get());
+ break;
+ case METHOD:
+ visitor.visitAnnotationOnMethod((AbstractMethodDeclaration)up().get(), this, (Annotation)get());
+ break;
+ case ARGUMENT:
+ visitor.visitAnnotationOnMethodArgument(
+ (Argument)parent.get(),
+ (AbstractMethodDeclaration)parent.directUp().get(),
+ this, (Annotation)get());
+ break;
+ case LOCAL:
+ visitor.visitAnnotationOnLocal((LocalDeclaration)parent.get(), this, (Annotation)get());
+ break;
+ default:
+ throw new AssertionError("Annotion not expected as child of a " + up().getKind());
+ }
+ break;
+ case STATEMENT:
+ visitor.visitStatement(this, (Statement)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitStatement(this, (Statement)get());
+ break;
+ default:
+ throw new AssertionError("Unexpected kind during node traversal: " + getKind());
+ }
+ }
+
@Override public String getName() {
final char[] n;
if ( node instanceof TypeDeclaration ) n = ((TypeDeclaration)node).name;
diff --git a/src/lombok/javac/JavacAST.java b/src/lombok/javac/JavacAST.java
index 99727553..63218a9a 100644
--- a/src/lombok/javac/JavacAST.java
+++ b/src/lombok/javac/JavacAST.java
@@ -62,79 +62,12 @@ public class JavacAST extends AST<JCTree> {
}
public void traverse(JavacASTVisitor visitor) {
- Node current = top();
- visitor.visitCompilationUnit(current, (JCCompilationUnit)current.get());
- traverseChildren(visitor, current);
- visitor.endVisitCompilationUnit(current, (JCCompilationUnit)current.get());
+ top().traverse(visitor);
}
private void traverseChildren(JavacASTVisitor visitor, Node node) {
for ( Node child : node.down() ) {
- JCTree n = child.get();
-
- switch ( child.getKind() ) {
- case TYPE:
- visitor.visitType(child, (JCClassDecl)n);
- traverseChildren(visitor, child);
- visitor.endVisitType(child, (JCClassDecl)n);
- break;
- case FIELD:
- visitor.visitField(child, (JCVariableDecl)n);
- traverseChildren(visitor, child);
- visitor.endVisitField(child, (JCVariableDecl)n);
- break;
- case METHOD:
- visitor.visitMethod(child, (JCMethodDecl)n);
- traverseChildren(visitor, child);
- visitor.endVisitMethod(child, (JCMethodDecl)n);
- break;
- case INITIALIZER:
- visitor.visitInitializer(child, (JCBlock)n);
- traverseChildren(visitor, child);
- visitor.endVisitInitializer(child, (JCBlock)n);
- break;
- case ARGUMENT:
- JCMethodDecl parent = (JCMethodDecl) child.up().get();
- visitor.visitMethodArgument(child, (JCVariableDecl)n, parent);
- traverseChildren(visitor, child);
- visitor.endVisitMethodArgument(child, (JCVariableDecl)n, parent);
- break;
- case LOCAL:
- visitor.visitLocal(child, (JCVariableDecl)n);
- traverseChildren(visitor, child);
- visitor.endVisitLocal(child, (JCVariableDecl)n);
- break;
- case STATEMENT:
- visitor.visitStatement(child, (JCTree)n);
- traverseChildren(visitor, child);
- visitor.endVisitStatement(node, (JCTree)n);
- break;
- case ANNOTATION:
- switch ( child.up().getKind() ) {
- case TYPE:
- visitor.visitAnnotationOnType((JCClassDecl)child.up().get(), child, (JCAnnotation)n);
- break;
- case FIELD:
- visitor.visitAnnotationOnField((JCVariableDecl)child.up().get(), child, (JCAnnotation)n);
- break;
- case METHOD:
- visitor.visitAnnotationOnMethod((JCMethodDecl)child.up().get(), child, (JCAnnotation)n);
- break;
- case ARGUMENT:
- JCVariableDecl argument = (JCVariableDecl)child.up().get();
- JCMethodDecl method = (JCMethodDecl)child.up().up().get();
- visitor.visitAnnotationOnMethodArgument(argument, method, child, (JCAnnotation)n);
- break;
- case LOCAL:
- visitor.visitAnnotationOnLocal((JCVariableDecl)child.up().get(), child, (JCAnnotation)n);
- break;
- default:
- throw new AssertionError("Can't be reached");
- }
- break;
- default:
- throw new AssertionError("Can't be reached: " + child.getKind());
- }
+ child.traverse(visitor);
}
}
@@ -194,12 +127,12 @@ public class JavacAST extends AST<JCTree> {
return putInMap(new Node(field, childNodes, Kind.FIELD));
}
- private Node buildLocalVar(JCVariableDecl local) {
+ private Node buildLocalVar(JCVariableDecl local, Kind kind) {
if ( alreadyHandled(local) ) return null;
List<Node> childNodes = new ArrayList<Node>();
for ( JCAnnotation annotation : local.mods.annotations ) addIfNotNull(childNodes, buildAnnotation(annotation));
addIfNotNull(childNodes, buildExpression(local.init));
- return putInMap(new Node(local, childNodes, Kind.LOCAL));
+ return putInMap(new Node(local, childNodes, kind));
}
private Node buildInitializer(JCBlock initializer) {
@@ -213,7 +146,7 @@ public class JavacAST extends AST<JCTree> {
if ( alreadyHandled(method) ) return null;
List<Node> childNodes = new ArrayList<Node>();
for ( JCAnnotation annotation : method.mods.annotations ) addIfNotNull(childNodes, buildAnnotation(annotation));
- for ( JCVariableDecl param : method.params ) addIfNotNull(childNodes, buildLocalVar(param));
+ for ( JCVariableDecl param : method.params ) addIfNotNull(childNodes, buildLocalVar(param, Kind.ARGUMENT));
if ( method.body != null && method.body.stats != null )
for ( JCStatement statement : method.body.stats ) addIfNotNull(childNodes, buildStatement(statement));
return putInMap(new Node(method, childNodes, Kind.METHOD));
@@ -236,7 +169,7 @@ public class JavacAST extends AST<JCTree> {
if ( statement == null || alreadyHandled(statement) ) return null;
if ( statement instanceof JCAnnotation ) return null;
if ( statement instanceof JCClassDecl ) return buildType((JCClassDecl)statement);
- if ( statement instanceof JCVariableDecl ) return buildLocalVar((JCVariableDecl)statement);
+ if ( statement instanceof JCVariableDecl ) return buildLocalVar((JCVariableDecl)statement, Kind.LOCAL);
//We drill down because LocalDeclarations and TypeDeclarations can occur anywhere, even in, say,
//an if block, or even the expression on an assert statement!
@@ -267,6 +200,77 @@ public class JavacAST extends AST<JCTree> {
super(node, children, kind);
}
+ public void traverse(JavacASTVisitor visitor) {
+ switch ( this.getKind() ) {
+ case COMPILATION_UNIT:
+ visitor.visitCompilationUnit(this, (JCCompilationUnit)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitCompilationUnit(this, (JCCompilationUnit)get());
+ break;
+ case TYPE:
+ visitor.visitType(this, (JCClassDecl)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitType(this, (JCClassDecl)get());
+ break;
+ case FIELD:
+ visitor.visitField(this, (JCVariableDecl)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitField(this, (JCVariableDecl)get());
+ break;
+ case METHOD:
+ visitor.visitMethod(this, (JCMethodDecl)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitMethod(this, (JCMethodDecl)get());
+ break;
+ case INITIALIZER:
+ visitor.visitInitializer(this, (JCBlock)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitInitializer(this, (JCBlock)get());
+ break;
+ case ARGUMENT:
+ JCMethodDecl parent = (JCMethodDecl) up().get();
+ visitor.visitMethodArgument(this, (JCVariableDecl)get(), parent);
+ traverseChildren(visitor, this);
+ visitor.endVisitMethodArgument(this, (JCVariableDecl)get(), parent);
+ break;
+ case LOCAL:
+ visitor.visitLocal(this, (JCVariableDecl)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitLocal(this, (JCVariableDecl)get());
+ break;
+ case STATEMENT:
+ visitor.visitStatement(this, (JCTree)get());
+ traverseChildren(visitor, this);
+ visitor.endVisitStatement(this, (JCTree)get());
+ break;
+ case ANNOTATION:
+ switch ( up().getKind() ) {
+ case TYPE:
+ visitor.visitAnnotationOnType((JCClassDecl)up().get(), this, (JCAnnotation)get());
+ break;
+ case FIELD:
+ visitor.visitAnnotationOnField((JCVariableDecl)up().get(), this, (JCAnnotation)get());
+ break;
+ case METHOD:
+ visitor.visitAnnotationOnMethod((JCMethodDecl)up().get(), this, (JCAnnotation)get());
+ break;
+ case ARGUMENT:
+ JCVariableDecl argument = (JCVariableDecl)up().get();
+ JCMethodDecl method = (JCMethodDecl)up().up().get();
+ visitor.visitAnnotationOnMethodArgument(argument, method, this, (JCAnnotation)get());
+ break;
+ case LOCAL:
+ visitor.visitAnnotationOnLocal((JCVariableDecl)up().get(), this, (JCAnnotation)get());
+ break;
+ default:
+ throw new AssertionError("Annotion not expected as child of a " + up().getKind());
+ }
+ break;
+ default:
+ throw new AssertionError("Unexpected kind during node traversal: " + getKind());
+ }
+ }
+
@Override public String getName() {
final Name n;
generated by cgit (git 2.46.0) at 2024-11-24 18:37:46 +0000