You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/02/25 15:51:17 UTC
[groovy] branch GROOVY_2_5_X updated (5411b2e -> 01025ba)
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a change to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 5411b2e fix for JDK7
new dae5d69 minor edits
new 01025ba vmplugin: parameter names from class
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../groovy/control/messages/LocatedMessage.java | 3 +
.../transform/AutoImplementASTTransformation.java | 20 ++---
.../transform/NamedVariantASTTransformation.java | 2 +-
.../transform/stc/StaticTypeCheckingVisitor.java | 18 +---
.../transform/trait/TraitASTTransformation.java | 3 +-
.../groovy/transform/trait/TraitComposer.java | 9 +-
.../transform/trait/TraitReceiverTransformer.java | 6 +-
.../codehaus/groovy/transform/trait/Traits.java | 3 +-
.../org/codehaus/groovy/vmplugin/v5/Java5.java | 97 +++++++++++-----------
.../org/codehaus/groovy/vmplugin/v7/Java7.java | 9 +-
.../org/codehaus/groovy/vmplugin/v8/Java8.java | 45 ++++------
11 files changed, 91 insertions(+), 124 deletions(-)
[groovy] 01/02: minor edits
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit dae5d6927ea6bd10cfd2165b5c408c05c082049b
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Fri Feb 25 09:36:22 2022 -0600
minor edits
---
.../groovy/control/messages/LocatedMessage.java | 3 +++
.../transform/AutoImplementASTTransformation.java | 20 +++++++++-----------
.../transform/NamedVariantASTTransformation.java | 2 +-
.../transform/stc/StaticTypeCheckingVisitor.java | 18 +++---------------
.../transform/trait/TraitASTTransformation.java | 3 +--
.../groovy/transform/trait/TraitComposer.java | 9 +++------
.../transform/trait/TraitReceiverTransformer.java | 6 +++---
.../org/codehaus/groovy/transform/trait/Traits.java | 3 +--
8 files changed, 24 insertions(+), 40 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/control/messages/LocatedMessage.java b/src/main/java/org/codehaus/groovy/control/messages/LocatedMessage.java
index 959c3f6..63efb1c 100644
--- a/src/main/java/org/codehaus/groovy/control/messages/LocatedMessage.java
+++ b/src/main/java/org/codehaus/groovy/control/messages/LocatedMessage.java
@@ -40,6 +40,9 @@ public class LocatedMessage extends SimpleMessage {
this.context = context;
}
+ public CSTNode getContext() {
+ return context;
+ }
public void write(PrintWriter writer, Janitor janitor) {
if (owner instanceof SourceUnit) {
diff --git a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
index 08c56af..522f5df 100644
--- a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
@@ -30,7 +30,6 @@ import org.codehaus.groovy.ast.Parameter;
import org.codehaus.groovy.ast.PropertyNode;
import org.codehaus.groovy.ast.expr.ClosureExpression;
import org.codehaus.groovy.ast.expr.Expression;
-import org.codehaus.groovy.ast.stmt.BlockStatement;
import org.codehaus.groovy.ast.stmt.EmptyStatement;
import org.codehaus.groovy.ast.stmt.Statement;
import org.codehaus.groovy.control.CompilePhase;
@@ -46,12 +45,12 @@ import static org.apache.groovy.ast.tools.ClassNodeUtils.addGeneratedMethod;
import static org.apache.groovy.ast.tools.MethodNodeUtils.getPropertyName;
import static org.apache.groovy.ast.tools.MethodNodeUtils.methodDescriptorWithoutReturnType;
import static org.codehaus.groovy.antlr.AntlrParserPlugin.getDefaultValueForPrimitive;
-import static org.codehaus.groovy.ast.expr.ArgumentListExpression.EMPTY_ARGUMENTS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.callX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.constX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.getGetterName;
import static org.codehaus.groovy.ast.tools.GeneralUtils.getSetterName;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.nullX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.returnS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.throwS;
import static org.codehaus.groovy.ast.tools.GeneralUtils.varX;
@@ -218,17 +217,16 @@ public class AutoImplementASTTransformation extends AbstractASTTransformation {
}
private Statement buildMethodBody(final ClassNode exception, final String message, final ClosureExpression code, final ClassNode returnType) {
- BlockStatement body = new BlockStatement();
if (code != null) {
- body.addStatement(code.getCode());
- } else if (exception != null) {
- body.addStatement(throwS(ctorX(exception, message == null ? EMPTY_ARGUMENTS : constX(message))));
- } else {
- Expression result = getDefaultValueForPrimitive(returnType);
- if (result != null) {
- body.addStatement(returnS(result));
+ return code.getCode();
+ }
+ if (exception != null) {
+ if (message == null) {
+ return throwS(ctorX(exception));
}
+ return throwS(ctorX(exception, constX(message)));
}
- return body;
+ Expression value = getDefaultValueForPrimitive(returnType);
+ return (value != null ? returnS(value) : returnS(nullX()));
}
}
diff --git a/src/main/java/org/codehaus/groovy/transform/NamedVariantASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/NamedVariantASTTransformation.java
index 91f0fc9..c09a349 100644
--- a/src/main/java/org/codehaus/groovy/transform/NamedVariantASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/NamedVariantASTTransformation.java
@@ -277,7 +277,7 @@ public class NamedVariantASTTransformation extends AbstractASTTransformation {
if (defaultValue == null && isPrimitiveType(type)) {
defaultValue = defaultValueX(type);
}
- if (defaultValue != null) {
+ if (defaultValue != null) { // GROOVY-9158, GROOVY-9183
if (isPrimitiveType(type)) { // handle null for primitive
value = ternaryX(notNullX(value), value, defaultValueX(type));
}
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 6d69498..00314dc 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -690,12 +690,8 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
return;
}
- // a dynamic variable is either an undeclared variable
- // or a member of a class used in a 'with'
- DynamicVariable dyn = (DynamicVariable) accessedVariable;
- // first, we must check the 'with' context
- String dynName = dyn.getName();
- if (tryVariableExpressionAsProperty(vexp, dynName)) return;
+ // a dynamic variable is either a closure property, a class member referenced from a closure, or an undeclared variable
+ if (tryVariableExpressionAsProperty(vexp, vexp.getName())) return;
if (!extension.handleUnresolvedVariableExpression(vexp)) {
addStaticTypeError("The variable [" + vexp.getName() + "] is undeclared.", vexp);
@@ -3827,18 +3823,12 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
if (!typeCheckingContext.enclosingBlocks.isEmpty()) {
BinaryExpression instanceOfExpression = findInstanceOfNotReturnExpression(ifElse);
- if (instanceOfExpression == null) {
- instanceOfExpression = findInstanceOfNotReturnExpression(ifElse);
- }
- if (instanceOfExpression != null) {
- visitInstanceofNot(instanceOfExpression);
- }
+ if (instanceOfExpression != null) visitInstanceofNot(instanceOfExpression);
}
}
public void visitInstanceofNot(BinaryExpression be) {
final BlockStatement currentBlock = typeCheckingContext.enclosingBlocks.getFirst();
- assert currentBlock != null;
if (typeCheckingContext.blockStatements2Types.containsKey(currentBlock)) {
// another instanceOf_not was before, no need store vars
} else {
@@ -4076,8 +4066,6 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
popAssignmentTracking(oldTracker);
}
- // currently just for empty literals, not for e.g. Collections.emptyList() at present
- /// it seems attractive to want to do this for more cases but perhaps not all cases
private ClassNode checkForTargetType(final Expression expr, final ClassNode type) {
BinaryExpression enclosingBinaryExpression = typeCheckingContext.getEnclosingBinaryExpression();
if (enclosingBinaryExpression instanceof DeclarationExpression
diff --git a/src/main/java/org/codehaus/groovy/transform/trait/TraitASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
index 02f4947..6cf3f7a 100644
--- a/src/main/java/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/trait/TraitASTTransformation.java
@@ -70,7 +70,6 @@ import java.util.List;
import java.util.Set;
import static org.apache.groovy.ast.tools.AnnotatedNodeUtils.markAsGenerated;
-import static org.codehaus.groovy.ast.tools.GeneralUtils.returnS;
import static org.codehaus.groovy.transform.trait.SuperCallTraitTransformer.UNRESOLVED_HELPER_CLASS;
/**
@@ -496,7 +495,7 @@ public class TraitASTTransformation extends AbstractASTTransformation implements
field.getOriginType(),
new Parameter[]{createSelfParameter(trait, field.isStatic())},
ClassNode.EMPTY_ARRAY,
- returnS(initCode.getExpression())
+ GeneralUtils.returnS(initCode.getExpression())
);
helper.addMethod(fieldInitializer);
} else {
diff --git a/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java b/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
index 53ed407..3a76b2c 100644
--- a/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
+++ b/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
@@ -293,7 +293,7 @@ public abstract class TraitComposer {
// but add empty body for setter for legacy compatibility
MethodNode impl = new MethodNode(
methodNode.getName(),
- Opcodes.ACC_PUBLIC | isStatic,
+ Opcodes.ACC_PUBLIC | isStatic | Opcodes.ACC_SYNTHETIC,
returnType,
newParams,
ClassNode.EMPTY_ARRAY,
@@ -341,8 +341,7 @@ public abstract class TraitComposer {
// guaranteed to be always present
boolean isHelperForStaticMethod = helperMethodParams[0].getOriginType().equals(ClassHelper.CLASS_Type);
if (Modifier.isPrivate(access) && !isHelperForStaticMethod) {
- // do not create forwarder for private methods
- // see GROOVY-7213
+ // GROOVY-7213: do not create forwarder for private methods
return;
}
if (!isHelperForStaticMethod) {
@@ -380,9 +379,7 @@ public abstract class TraitComposer {
AnnotationNode bridgeAnnotation = new AnnotationNode(Traits.TRAITBRIDGE_CLASSNODE);
bridgeAnnotation.addMember("traitClass", new ClassExpression(trait));
bridgeAnnotation.addMember("desc", new ConstantExpression(BytecodeHelper.getMethodDescriptor(helperMethod.getReturnType(), traitMethodParams)));
- forwarder.addAnnotation(
- bridgeAnnotation
- );
+ forwarder.addAnnotation(bridgeAnnotation);
MethodNode existingMethod = findExistingMethod(targetNode, forwarder);
if (existingMethod != null) {
diff --git a/src/main/java/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java b/src/main/java/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java
index 3d01b29..fa8b8cd 100644
--- a/src/main/java/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java
+++ b/src/main/java/org/codehaus/groovy/transform/trait/TraitReceiverTransformer.java
@@ -199,7 +199,7 @@ class TraitReceiverTransformer extends ClassCodeExpressionTransformer {
method,
ArgumentListExpression.EMPTY_ARGUMENTS
);
- mce.setSourcePosition(exp);
+ mce.setSourcePosition(exp instanceof PropertyExpression ? ((PropertyExpression) exp).getProperty() : exp);
mce.setImplicitThis(false);
return mce;
}
@@ -253,7 +253,7 @@ class TraitReceiverTransformer extends ClassCodeExpressionTransformer {
method,
new ArgumentListExpression(super.transform(rightExpression))
);
- mce.setSourcePosition(exp);
+ mce.setSourcePosition(leftExpression instanceof PropertyExpression ? ((PropertyExpression) leftExpression).getProperty() : leftExpression);
mce.setImplicitThis(false);
markDynamicCall(mce, staticField, isStatic);
return mce;
@@ -327,7 +327,7 @@ class TraitReceiverTransformer extends ClassCodeExpressionTransformer {
);
newCall.setImplicitThis(false);
newCall.setSafe(call.isSafe());
- newCall.setSourcePosition(call);
+ newCall.getMethod().setSourcePosition(call.getMethod());
newCall.setSpreadSafe(call.isSpreadSafe());
return newCall;
}
diff --git a/src/main/java/org/codehaus/groovy/transform/trait/Traits.java b/src/main/java/org/codehaus/groovy/transform/trait/Traits.java
index b752ebb..23dd997 100644
--- a/src/main/java/org/codehaus/groovy/transform/trait/Traits.java
+++ b/src/main/java/org/codehaus/groovy/transform/trait/Traits.java
@@ -147,8 +147,7 @@ public abstract class Traits {
// precompiled trait
try {
final ClassLoader classLoader = trait.getTypeClass().getClassLoader();
- String helperClassName = Traits.helperClassName(trait);
- helperClassNode = ClassHelper.make(Class.forName(helperClassName, false, classLoader));
+ helperClassNode = ClassHelper.make(Class.forName(Traits.helperClassName(trait), false, classLoader));
try {
fieldHelperClassNode = ClassHelper.make(classLoader.loadClass(Traits.fieldHelperClassName(trait)));
staticFieldHelperClassNode = ClassHelper.make(classLoader.loadClass(Traits.staticFieldHelperClassName(trait)));
[groovy] 02/02: vmplugin: parameter names from class
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 01025ba74d6c12baeab6dc205fd01f259fd4859d
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Fri Feb 25 09:36:28 2022 -0600
vmplugin: parameter names from class
2_5_X backport
---
.../org/codehaus/groovy/vmplugin/v5/Java5.java | 97 +++++++++++-----------
.../org/codehaus/groovy/vmplugin/v7/Java7.java | 9 +-
.../org/codehaus/groovy/vmplugin/v8/Java8.java | 45 ++++------
3 files changed, 67 insertions(+), 84 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v5/Java5.java b/src/main/java/org/codehaus/groovy/vmplugin/v5/Java5.java
index 5d95d62..2e02afa 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v5/Java5.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v5/Java5.java
@@ -50,6 +50,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.MalformedParameterizedTypeException;
+import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
@@ -61,11 +62,24 @@ import java.util.List;
* java 5 based functions
*/
public class Java5 implements VMPlugin {
+
private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
- private static final Class[] PLUGIN_DGM = {PluginDefaultGroovyMethods.class};
private static final Method[] EMPTY_METHOD_ARRAY = new Method[0];
private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0];
+ @Override
+ public int getVersion() {
+ return 5;
+ }
+
+ public Class[] getPluginDefaultGroovyMethods() {
+ return new Class[]{PluginDefaultGroovyMethods.class};
+ }
+
+ public Class[] getPluginStaticGroovyMethods() {
+ return EMPTY_CLASS_ARRAY;
+ }
+
public void setAdditionalClassInformation(ClassNode cn) {
setGenericsTypes(cn);
}
@@ -148,14 +162,15 @@ public class Java5 implements VMPlugin {
private ClassNode configureWildcardType(WildcardType wildcardType) {
ClassNode base = ClassHelper.makeWithoutCaching("?");
base.setRedirect(ClassHelper.OBJECT_TYPE);
- //TODO: more than one lower bound for wildcards?
+
ClassNode[] lowers = configureTypes(wildcardType.getLowerBounds());
- ClassNode lower = null;
- // TODO: is it safe to remove this? What was the original intention?
- if (lowers != null) lower = lowers[0];
+ ClassNode[] uppers = configureTypes(wildcardType.getUpperBounds());
+ // beware of [Object] upper bounds; often it's <?> or <? super T>
+ if (lowers != null || wildcardType.getTypeName().equals("?")) {
+ uppers = null;
+ }
- ClassNode[] upper = configureTypes(wildcardType.getUpperBounds());
- GenericsType t = new GenericsType(base, upper, lower);
+ GenericsType t = new GenericsType(base, uppers, lowers != null ? lowers[0] : null);
t.setWildcard(true);
ClassNode ref = ClassHelper.makeWithoutCaching(Object.class, false);
@@ -196,14 +211,6 @@ public class Java5 implements VMPlugin {
return gts;
}
- public Class[] getPluginDefaultGroovyMethods() {
- return PLUGIN_DGM;
- }
-
- public Class[] getPluginStaticGroovyMethods() {
- return EMPTY_CLASS_ARRAY;
- }
-
private void setAnnotationMetaData(Annotation[] annotations, AnnotatedNode an) {
for (Annotation annotation : annotations) {
AnnotationNode node = new AnnotationNode(ClassHelper.make(annotation.annotationType()));
@@ -373,7 +380,7 @@ public class Java5 implements VMPlugin {
Method[] methods = clazz.getDeclaredMethods();
for (Method m : methods) {
ClassNode ret = makeClassNode(compileUnit, m.getGenericReturnType(), m.getReturnType());
- Parameter[] params = processParameters(compileUnit, m);
+ Parameter[] params = makeParameters(compileUnit, m.getGenericParameterTypes(), m.getParameterTypes(), m.getParameterAnnotations(), m);
ClassNode[] exceptions = makeClassNodes(compileUnit, m.getGenericExceptionTypes(), m.getExceptionTypes());
MethodNode mn = new MethodNode(m.getName(), m.getModifiers(), ret, params, exceptions, null);
mn.setSynthetic(m.isSynthetic());
@@ -384,15 +391,7 @@ public class Java5 implements VMPlugin {
}
Constructor[] constructors = clazz.getDeclaredConstructors();
for (Constructor ctor : constructors) {
- Type[] types = ctor.getGenericParameterTypes();
- Parameter[] params1 = Parameter.EMPTY_ARRAY;
- if (types.length > 0) {
- params1 = new Parameter[types.length];
- for (int i = 0; i < params1.length; i++) {
- params1[i] = makeParameter(compileUnit, types[i], ctor.getParameterTypes()[i], getConstructorParameterAnnotations(ctor)[i], "param" + i);
- }
- }
- Parameter[] params = params1;
+ Parameter[] params = makeParameters(compileUnit, ctor.getGenericParameterTypes(), ctor.getParameterTypes(), getConstructorParameterAnnotations(ctor), ctor);
ClassNode[] exceptions = makeClassNodes(compileUnit, ctor.getGenericExceptionTypes(), ctor.getExceptionTypes());
ConstructorNode cn = classNode.addConstructor(ctor.getModifiers(), params, exceptions, null);
setAnnotationMetaData(ctor.getAnnotations(), cn);
@@ -414,18 +413,6 @@ public class Java5 implements VMPlugin {
}
}
- protected Parameter[] processParameters(CompileUnit compileUnit, Method m) {
- Type[] types = m.getGenericParameterTypes();
- Parameter[] params = Parameter.EMPTY_ARRAY;
- if (types.length > 0) {
- params = new Parameter[types.length];
- for (int i = 0; i < params.length; i++) {
- params[i] = makeParameter(compileUnit, types[i], m.getParameterTypes()[i], m.getParameterAnnotations()[i], "param" + i);
- }
- }
- return params;
- }
-
/**
* Synthetic parameters such as those added for inner class constructors may
* not be included in the parameter annotations array. This is the case when
@@ -514,23 +501,36 @@ public class Java5 implements VMPlugin {
return back.getPlainNodeReference();
}
- protected Parameter makeParameter(CompileUnit cu, Type type, Class cl, Annotation[] annotations, String name) {
- ClassNode cn = makeClassNode(cu, type, cl);
- Parameter parameter = new Parameter(cn, name);
- setAnnotationMetaData(annotations, parameter);
- return parameter;
+ private Parameter[] makeParameters(CompileUnit cu, Type[] types, Class[] cls, Annotation[][] parameterAnnotations, Member member) {
+ Parameter[] params = Parameter.EMPTY_ARRAY;
+ int n = types.length;
+ if (n > 0) {
+ params = new Parameter[n];
+ String[] names = new String[n];
+ fillParameterNames(names, member);
+ for (int i = 0; i < n; i += 1) {
+ setAnnotationMetaData(parameterAnnotations[i],
+ params[i] = new Parameter(makeClassNode(cu, types[i], cls[i]), names[i]));
+ }
+ }
+ return params;
+ }
+
+ protected void fillParameterNames(String[] names, Member member) {
+ for (int i = 0, n = names.length; i < n; i += 1) {
+ names[i] = (i < ARGS.length ? ARGS[i] : "arg" + i);
+ }
}
- public void invalidateCallSites() {}
+ // arbitrary choice of first ten; maintaining this array prevents many thousands of "argN" string/char[] instances
+ private static final String[] ARGS = {"arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9"};
- @Override
- public Object getInvokeSpecialHandle(Method m, Object receiver){
- throw new GroovyBugError("getInvokeSpecialHandle requires at least JDK 7 wot private access to Lookup");
+ public void invalidateCallSites() {
}
@Override
- public int getVersion() {
- return 5;
+ public Object getInvokeSpecialHandle(Method m, Object receiver){
+ throw new GroovyBugError("getInvokeSpecialHandle requires at least JDK 7 wot private access to Lookup");
}
@Override
@@ -538,4 +538,3 @@ public class Java5 implements VMPlugin {
throw new GroovyBugError("invokeHandle requires at least JDK 7");
}
}
-
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v7/Java7.java b/src/main/java/org/codehaus/groovy/vmplugin/v7/Java7.java
index 792ff14..782b70b 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v7/Java7.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v7/Java7.java
@@ -34,10 +34,6 @@ import java.security.PrivilegedAction;
* ahead of this one.
*/
public class Java7 extends Java6 {
- @Override
- public void invalidateCallSites() {
- IndyInterface.invalidateSwitchPoints();
- }
@Override
public int getVersion() {
@@ -45,6 +41,11 @@ public class Java7 extends Java6 {
}
@Override
+ public void invalidateCallSites() {
+ IndyInterface.invalidateSwitchPoints();
+ }
+
+ @Override
public Object getInvokeSpecialHandle(final Method method, final Object receiver) {
if (getLookupConstructor() == null) {
return super.getInvokeSpecialHandle(method, receiver);
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/Java8.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/Java8.java
index 3c1bc32..89a1ad6 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v8/Java8.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/Java8.java
@@ -20,20 +20,17 @@ package org.codehaus.groovy.vmplugin.v8;
import groovy.lang.GroovyRuntimeException;
import org.codehaus.groovy.ast.AnnotationNode;
-import org.codehaus.groovy.ast.CompileUnit;
-import org.codehaus.groovy.ast.Parameter;
import org.codehaus.groovy.vmplugin.v7.Java7;
import java.lang.annotation.ElementType;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Member;
import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.lang.reflect.Parameter;
/**
* Java 8 based functions.
@@ -42,24 +39,14 @@ import java.util.List;
*/
public class Java8 extends Java7 {
- private final Class<?>[] PLUGIN_DGM;
-
- public Java8() {
- super();
- List<Class<?>> dgmClasses = new ArrayList<>();
- Collections.addAll(dgmClasses, (Class<?>[]) super.getPluginDefaultGroovyMethods());
- dgmClasses.add(PluginDefaultGroovyMethods.class);
- PLUGIN_DGM = dgmClasses.toArray(new Class<?>[0]);
- }
-
@Override
- public Class<?>[] getPluginDefaultGroovyMethods() {
- return PLUGIN_DGM;
+ public int getVersion() {
+ return 8;
}
@Override
- public int getVersion() {
- return 8;
+ public Class<?>[] getPluginDefaultGroovyMethods() {
+ return new Class[]{org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods.class, PluginDefaultGroovyMethods.class};
}
@Override
@@ -74,19 +61,15 @@ public class Java8 extends Java7 {
}
@Override
- protected Parameter[] processParameters(CompileUnit compileUnit, Method m) {
- java.lang.reflect.Parameter[] parameters = m.getParameters();
- Type[] types = m.getGenericParameterTypes();
- Parameter[] params = Parameter.EMPTY_ARRAY;
- if (types.length > 0) {
- params = new Parameter[types.length];
- for (int i = 0; i < params.length; i++) {
- java.lang.reflect.Parameter p = parameters[i];
- String name = p.isNamePresent() ? p.getName() : "param" + i;
- params[i] = makeParameter(compileUnit, types[i], m.getParameterTypes()[i], m.getParameterAnnotations()[i], name);
+ protected void fillParameterNames(String[] names, Member member) {
+ try {
+ Parameter[] parameters = ((Executable) member).getParameters();
+ for (int i = 0, n = names.length; i < n; i += 1) {
+ names[i] = parameters[i].getName();
}
+ } catch (RuntimeException e) {
+ super.fillParameterNames(names, member);
}
- return params;
}
private static class LookupHolder {