Skip to content

Commit

Permalink
[javac] Added/improved support for the 'receiver parameter' feature
Browse files Browse the repository at this point in the history
  • Loading branch information
@rzwitserloot
rzwitserloot committed Oct 3, 2020
1 parent 1b534d1 commit 07e921d
Show file tree
Hide file tree
Showing 2 changed files with 138 additions and 15 deletions.
26 changes: 24 additions & 2 deletions src/core/lombok/javac/JavacASTVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
package lombok.javac;

import java.io.PrintStream;
import java.lang.reflect.Field;

import com.sun.source.util.Trees;
import com.sun.tools.javac.code.Flags;
Expand All @@ -32,6 +33,7 @@
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
import com.sun.tools.javac.util.List;

/**
* Implement so you can ask any JavacAST.LombokNode to traverse depth-first through all children,
Expand Down Expand Up @@ -223,6 +225,26 @@ private String printFlags(long f) {
} else type = "METHOD";
print("<%s %s> %s returns: %s", type, method.name, printFlags(method.mods.flags), method.restype);
indent++;
JCVariableDecl recv;
try {
Field f = JCMethodDecl.class.getField("recvparam");
recv = (JCVariableDecl) f.get(method);
} catch (Exception ignore) {
recv = null;
}

if (recv != null) {
List<JCAnnotation> annotations = recv.mods.annotations;
if (recv.mods != null) annotations = recv.mods.annotations;
boolean innerContent = annotations != null && annotations.isEmpty();
print("<RECEIVER-PARAM (%s) %s %s%s> %s", recv.vartype == null ? "null" : recv.vartype.getClass().toString(), recv.vartype, recv.name, innerContent ? "" : " /", printFlags(recv.mods.flags));
if (innerContent) {
indent++;
for (JCAnnotation ann : annotations) print("<ANNOTATION: %s />", ann);
indent--;
print("</RECEIVER-PARAM>");
}
}
if (printContent) {
if (method.body == null) print("(ABSTRACT)");
else print("%s", method.body);
Expand All @@ -237,11 +259,11 @@ private String printFlags(long f) {
@Override public void endVisitMethod(JavacNode node, JCMethodDecl method) {
if (printContent) disablePrinting--;
indent--;
print("</%s %s>", "XMETHOD", method.name);
print("</%s %s>", "METHOD", method.name);
}

@Override public void visitMethodArgument(JavacNode node, JCVariableDecl arg, JCMethodDecl method) {
print("<METHODARG %s %s> %s", arg.vartype, arg.name, printFlags(arg.mods.flags));
print("<METHODARG (%s) %s %s> %s", arg.vartype.getClass().toString(), arg.vartype, arg.name, printFlags(arg.mods.flags));
indent++;
}

Expand Down
127 changes: 114 additions & 13 deletions src/utils/lombok/javac/JavacTreeMaker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

Expand Down Expand Up @@ -106,7 +107,19 @@ public JavacTreeMaker at(int pos) {
return this;
}

private static class MethodId<J> {
private static final class FieldId<J> {
private final Class<?> owner;
private final String name;
private final Class<J> fieldType;

FieldId(Class<?> owner, String name, Class<J> fieldType) {
this.owner = owner;
this.name = name;
this.fieldType = fieldType;
}
}

private static final class MethodId<J> {
private final Class<?> owner;
private final String name;
private final Class<J> returnType;
Expand Down Expand Up @@ -332,9 +345,79 @@ static <J> MethodId<J> MethodId(String name) {
throw new InternalError("Not found: " + name);
}

private static final Object METHOD_NOT_FOUND = new Object[0];
private static final Object METHOD_MULTIPLE_FOUND = new Object[0];
static <J> FieldId<J> FieldId(Class<?> owner, String name, Class<J> fieldType) {
return new FieldId<J>(owner, name, fieldType);
}

private static final ConcurrentHashMap<FieldId<?>, Object> FIELD_CACHE = new ConcurrentHashMap<FieldId<?>, Object>();

private static boolean has(FieldId<?> f) {
Object field = FIELD_CACHE.get(f);
if (field == REFLECTIVE_ITEM_NOT_FOUND) return false;
if (field instanceof Field) return true;

try {
return getFromCache(f) != REFLECTIVE_ITEM_NOT_FOUND;
} catch (IllegalStateException e) {
return false;
}
}

private static <J> J get(Object owner, FieldId<J> f) {
Field field = getFromCache(f);
try {
return f.fieldType.cast(field.get(owner));
} catch (IllegalAccessException e) {
throw Javac.sneakyThrow(e);
}
}

private static <J> void set(Object owner, FieldId<J> f, J val) {
Field field = getFromCache(f);
try {
field.set(owner, val);
} catch (IllegalAccessException e) {
throw Javac.sneakyThrow(e);
} catch (IllegalArgumentException e) {
System.err.println("Type mismatch for: " + field);
throw e;
}
}

private static Field getFromCache(FieldId<?> f) {
Object s = FIELD_CACHE.get(f);
if (s == null) s = addToCache(f);
if (s == REFLECTIVE_ITEM_NOT_FOUND) throw new IllegalStateException("Lombok TreeMaker frontend issue: no match when looking for field: " + f);
return (Field) s;
}

private static Object addToCache(FieldId<?> f) {
for (Field field : f.owner.getDeclaredFields()) {
if (f.name.equals(field.getName())) {
if (!Modifier.isPublic(field.getModifiers())) field.setAccessible(true);
return FIELD_CACHE.putIfAbsent(f, field);
}
}

return FIELD_CACHE.putIfAbsent(f, REFLECTIVE_ITEM_NOT_FOUND);
}

private static final Object REFLECTIVE_ITEM_NOT_FOUND = new Object[0];
private static final Object REFLECTIVE_ITEM_MULTIPLE_FOUND = new Object[0];
private static final ConcurrentHashMap<MethodId<?>, Object> METHOD_CACHE = new ConcurrentHashMap<MethodId<?>, Object>();

private boolean has(MethodId<?> m) {
Object method = METHOD_CACHE.get(m);
if (method == REFLECTIVE_ITEM_NOT_FOUND) return false;
if (method instanceof Method) return true;

try {
return getFromCache(m) != REFLECTIVE_ITEM_NOT_FOUND;
} catch (IllegalStateException e) {
return false;
}
}

private <J> J invoke(MethodId<J> m, Object... args) {
return invokeAny(tm, m, args);
}
Expand All @@ -351,8 +434,8 @@ private <J> J invoke(MethodId<J> m, Object... args) {
} catch (IllegalAccessException e) {
throw Javac.sneakyThrow(e);
} catch (IllegalArgumentException e) {
System.err.println(method);
throw Javac.sneakyThrow(e);
System.err.println("Type mismatch for: " + method);
throw e;
}
}

Expand All @@ -366,8 +449,8 @@ private static boolean tryResolve(MethodId<?> m) {
private static Method getFromCache(MethodId<?> m) {
Object s = METHOD_CACHE.get(m);
if (s == null) s = addToCache(m);
if (s == METHOD_MULTIPLE_FOUND) throw new IllegalStateException("Lombok TreeMaker frontend issue: multiple matches when looking for method: " + m);
if (s == METHOD_NOT_FOUND) throw new IllegalStateException("Lombok TreeMaker frontend issue: no match when looking for method: " + m);
if (s == REFLECTIVE_ITEM_MULTIPLE_FOUND) throw new IllegalStateException("Lombok TreeMaker frontend issue: multiple matches when looking for method: " + m);
if (s == REFLECTIVE_ITEM_NOT_FOUND) throw new IllegalStateException("Lombok TreeMaker frontend issue: no match when looking for method: " + m);
return (Method) s;
}

Expand All @@ -391,13 +474,13 @@ private static Object addToCache(MethodId<?> m) {
}
if (found == null) found = method;
else {
METHOD_CACHE.putIfAbsent(m, METHOD_MULTIPLE_FOUND);
return METHOD_MULTIPLE_FOUND;
METHOD_CACHE.putIfAbsent(m, REFLECTIVE_ITEM_MULTIPLE_FOUND);
return REFLECTIVE_ITEM_MULTIPLE_FOUND;
}
}
if (found == null) {
METHOD_CACHE.putIfAbsent(m, METHOD_NOT_FOUND);
return METHOD_NOT_FOUND;
METHOD_CACHE.putIfAbsent(m, REFLECTIVE_ITEM_NOT_FOUND);
return REFLECTIVE_ITEM_NOT_FOUND;
}
Permit.setAccessible(found);
Object marker = METHOD_CACHE.putIfAbsent(m, found);
Expand Down Expand Up @@ -431,8 +514,12 @@ public JCMethodDecl MethodDef(JCModifiers mods, Name name, JCExpression resType,

//javac versions: 8
private static final MethodId<JCMethodDecl> MethodDefWithRecvParam = MethodId("MethodDef", JCMethodDecl.class, JCModifiers.class, Name.class, JCExpression.class, List.class, JCVariableDecl.class, List.class, List.class, JCBlock.class, JCExpression.class);
public JCMethodDecl MethodDef(JCModifiers mods, Name name, JCExpression resType, List<JCTypeParameter> typarams, JCVariableDecl recvparam, List<JCVariableDecl> params, List<JCExpression> thrown, JCBlock body, JCExpression defaultValue) {
return invoke(MethodDefWithRecvParam, mods, name, resType, recvparam, typarams, params, thrown, body, defaultValue);
public boolean hasMethodDefWithRecvParam() {
return has(MethodDefWithRecvParam);
}

public JCMethodDecl MethodDefWithRecvParam(JCModifiers mods, Name name, JCExpression resType, List<JCTypeParameter> typarams, JCVariableDecl recvparam, List<JCVariableDecl> params, List<JCExpression> thrown, JCBlock body, JCExpression defaultValue) {
return invoke(MethodDefWithRecvParam, mods, name, resType, typarams, recvparam, params, thrown, body, defaultValue);
}

//javac versions: 6-8
Expand Down Expand Up @@ -878,4 +965,18 @@ public JCStatement Call(JCExpression apply) {
public JCExpression Type(Type type) {
return invoke(Type, type);
}

private static final FieldId<JCVariableDecl> MethodDecl_recvParam = FieldId(JCMethodDecl.class, "recvparam", JCVariableDecl.class);
//javac versions: 8+
public boolean hasReceiverParameter() {
return has(MethodDecl_recvParam);
}

public JCVariableDecl getReceiverParameter(JCMethodDecl method) {
return get(method, MethodDecl_recvParam);
}

public void setReceiverParameter(JCMethodDecl method, JCVariableDecl param) {
set(method, MethodDecl_recvParam, param);
}
}

0 comments on commit 07e921d

Please sign in to comment.