You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2019/12/21 13:56:18 UTC
[groovy] branch GROOVY_3_0_X updated (a62f6ad -> bd571f4)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from a62f6ad GROOVY-9347: extract super-interface generics information for SAM coerce
new 7d6425d GROOVY-9350: Bump javaparser to 3.15.7
new da6d819 Trivial refactoring: adjust the return type
new bd571f4 Trivial refactoring: rename method name
The 3 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:
build.gradle | 2 +-
.../org/codehaus/groovy/classgen/AsmClassGenerator.java | 14 +++++++-------
.../org/codehaus/groovy/classgen/asm/ClosureWriter.java | 2 +-
.../codehaus/groovy/classgen/asm/DelegatingController.java | 8 ++++----
.../org/codehaus/groovy/classgen/asm/InvocationWriter.java | 2 +-
.../org/codehaus/groovy/classgen/asm/WriterController.java | 8 ++++----
.../groovy/classgen/asm/sc/StaticInvocationWriter.java | 8 ++++----
.../sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java | 4 ++--
.../groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java | 4 ++--
.../groovy/classgen/asm/sc/StaticTypesLambdaWriter.java | 4 +---
10 files changed, 27 insertions(+), 29 deletions(-)
[groovy] 03/03: Trivial refactoring: rename method name
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit bd571f4ad1f6fee4d9094ab558716e4f0405b66d
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Dec 21 21:39:33 2019 +0800
Trivial refactoring: rename method name
(cherry picked from commit d399c9f0112f54c891fe7a66764660d61cbb0451)
---
.../org/codehaus/groovy/classgen/AsmClassGenerator.java | 14 +++++++-------
.../org/codehaus/groovy/classgen/asm/ClosureWriter.java | 2 +-
.../codehaus/groovy/classgen/asm/DelegatingController.java | 8 ++++----
.../org/codehaus/groovy/classgen/asm/InvocationWriter.java | 2 +-
.../org/codehaus/groovy/classgen/asm/WriterController.java | 8 ++++----
.../groovy/classgen/asm/sc/StaticInvocationWriter.java | 8 ++++----
.../sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java | 4 ++--
.../groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java | 4 ++--
8 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
index 2f73345..24ef1b8 100644
--- a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
+++ b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
@@ -1052,7 +1052,7 @@ public class AsmClassGenerator extends ClassGenerator {
if (isSuperExpression(objectExpression)) {
field = classNode.getSuperClass().getDeclaredField(name);
privateSuperField = (field != null && field.isPrivate());
- } else if (expression.isImplicitThis() || !controller.isInClosure()) {
+ } else if (expression.isImplicitThis() || !controller.isInGeneratedFunction()) {
field = classNode.getDeclaredField(name);
ClassNode outer = classNode.getOuterClass();
@@ -1089,7 +1089,7 @@ public class AsmClassGenerator extends ClassGenerator {
if (!visited) {
boolean useMetaObjectProtocol = isGroovyObject(objectExpression)
- && (!isThisOrSuper(objectExpression) || !controller.isStaticContext() || controller.isInClosure());
+ && (!isThisOrSuper(objectExpression) || !controller.isStaticContext() || controller.isInGeneratedFunction());
MethodCallerMultiAdapter adapter;
if (controller.getCompileStack().isLHS()) {
@@ -1171,7 +1171,7 @@ public class AsmClassGenerator extends ClassGenerator {
public void loadStaticField(final FieldExpression fldExp) {
MethodVisitor mv = controller.getMethodVisitor();
FieldNode field = fldExp.getField();
- boolean holder = field.isHolder() && !controller.isInClosureConstructor();
+ boolean holder = field.isHolder() && !controller.isInGeneratedFunctionConstructor();
ClassNode type = field.getType();
String ownerName = (field.getOwner().equals(controller.getClassNode()))
@@ -1193,7 +1193,7 @@ public class AsmClassGenerator extends ClassGenerator {
public void loadInstanceField(final FieldExpression fldExp) {
MethodVisitor mv = controller.getMethodVisitor();
FieldNode field = fldExp.getField();
- boolean holder = field.isHolder() && !controller.isInClosureConstructor();
+ boolean holder = field.isHolder() && !controller.isInGeneratedFunctionConstructor();
ClassNode type = field.getType();
String ownerName = (field.getOwner().equals(controller.getClassNode()))
? controller.getInternalClassName()
@@ -1247,7 +1247,7 @@ public class AsmClassGenerator extends ClassGenerator {
MethodVisitor mv = controller.getMethodVisitor();
FieldNode field = expression.getField();
- boolean holder = field.isHolder() && !controller.isInClosureConstructor();
+ boolean holder = field.isHolder() && !controller.isInGeneratedFunctionConstructor();
controller.getOperandStack().doGroovyCast(field);
String ownerName = (field.getOwner().equals(controller.getClassNode()))
@@ -1275,7 +1275,7 @@ public class AsmClassGenerator extends ClassGenerator {
if (expression.isThisExpression()) {
if (controller.isStaticMethod() || (!controller.getCompileStack().isImplicitThis() && controller.isStaticContext())) {
- if (controller.isInClosure()) classNode = controller.getOutermostClass();
+ if (controller.isInGeneratedFunction()) classNode = controller.getOutermostClass();
visitClassExpression(new ClassExpression(classNode));
} else {
loadThis(expression);
@@ -1307,7 +1307,7 @@ public class AsmClassGenerator extends ClassGenerator {
private void loadThis(final VariableExpression thisExpression) {
MethodVisitor mv = controller.getMethodVisitor();
mv.visitVarInsn(ALOAD, 0);
- if (controller.isInClosure() && !controller.getCompileStack().isImplicitThis()) {
+ if (controller.isInGeneratedFunction() && !controller.getCompileStack().isImplicitThis()) {
mv.visitMethodInsn(INVOKEVIRTUAL, "groovy/lang/Closure", "getThisObject", "()Ljava/lang/Object;", false);
ClassNode expectedType = thisExpression!=null?controller.getTypeChooser().resolveType(thisExpression, controller.getOutermostClass()):null;
if (!ClassHelper.OBJECT_TYPE.equals(expectedType) && !ClassHelper.isPrimitiveType(expectedType)) {
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/ClosureWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/ClosureWriter.java
index 7156dd9..01a303f 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/ClosureWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/ClosureWriter.java
@@ -405,7 +405,7 @@ public class ClosureWriter {
protected void loadThis() {
MethodVisitor mv = controller.getMethodVisitor();
mv.visitVarInsn(ALOAD, 0);
- if (controller.isInClosure()) {
+ if (controller.isInGeneratedFunction()) {
mv.visitMethodInsn(INVOKEVIRTUAL, "groovy/lang/Closure", "getThisObject", "()Ljava/lang/Object;", false);
controller.getOperandStack().push(ClassHelper.OBJECT_TYPE);
} else {
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/DelegatingController.java b/src/main/java/org/codehaus/groovy/classgen/asm/DelegatingController.java
index de5cedf..7a6198c 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/DelegatingController.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/DelegatingController.java
@@ -205,13 +205,13 @@ public class DelegatingController extends WriterController {
}
@Override
- public boolean isInClosure() {
- return delegationController.isInClosure();
+ public boolean isInGeneratedFunction() {
+ return delegationController.isInGeneratedFunction();
}
@Override
- public boolean isInClosureConstructor() {
- return delegationController.isInClosureConstructor();
+ public boolean isInGeneratedFunctionConstructor() {
+ return delegationController.isInGeneratedFunctionConstructor();
}
@Override
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/InvocationWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/InvocationWriter.java
index 6848dab..1ea8f15 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/InvocationWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/InvocationWriter.java
@@ -145,7 +145,7 @@ public class InvocationWriter {
&& !classNode.implementsInterface(declaringClass)) {
// we are calling an outer class method
compileStack.pushImplicitThis(false);
- if (controller.isInClosure()) {
+ if (controller.isInGeneratedFunction()) {
new VariableExpression("thisObject").visit(controller.getAcg());
} else {
Expression expr = new PropertyExpression(new ClassExpression(declaringClass), "this");
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java b/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java
index 6eae8ab..4c124a9 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/WriterController.java
@@ -277,17 +277,17 @@ public class WriterController {
if (compileStack != null && compileStack.getScope() != null) {
return compileStack.getScope().isInStaticContext();
}
- if (!isInClosure()) return false;
+ if (!isInGeneratedFunction()) return false;
if (isConstructor()) return false;
return classNode.isStaticClass() || isStaticMethod();
}
- public boolean isInClosure() {
+ public boolean isInGeneratedFunction() {
return classNode.getOuterClass() != null && isGeneratedFunction(classNode);
}
- public boolean isInClosureConstructor() {
- return isConstructor() && isInClosure();
+ public boolean isInGeneratedFunctionConstructor() {
+ return isConstructor() && isInGeneratedFunction();
}
public boolean isStaticMethod() {
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
index e6abdaa..5d56aa6 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
@@ -244,7 +244,7 @@ public class StaticInvocationWriter extends InvocationWriter {
if (bridge != null) {
Expression fixedReceiver = receiver;
if (implicitThis) {
- if (!controller.isInClosure()) {
+ if (!controller.isInGeneratedFunction()) {
fixedReceiver = new PropertyExpression(new ClassExpression(lookupClassNode), "this");
} else if (thisClass != null) {
ClassNode current = thisClass.getOuterClass();
@@ -292,7 +292,7 @@ public class StaticInvocationWriter extends InvocationWriter {
isThisOrSuper = ((VariableExpression) receiver).isThisExpression() || ((VariableExpression) receiver).isSuperExpression();
}
Expression fixedReceiver = null;
- if (isThisOrSuper && classNode instanceof InnerClassNode && controller.isInClosure()) {
+ if (isThisOrSuper && classNode instanceof InnerClassNode && controller.isInGeneratedFunction()) {
ClassNode current = classNode.getOuterClass();
fixedReceiver = new VariableExpression("thisObject", current);
// adjust for multiple levels of nesting if needed
@@ -332,7 +332,7 @@ public class StaticInvocationWriter extends InvocationWriter {
}
ClassNode classNode = controller.getClassNode();
if (classNode.isDerivedFrom(ClassHelper.CLOSURE_TYPE)
- && controller.isInClosure()
+ && controller.isInGeneratedFunction()
&& !target.isPublic()
&& target.getDeclaringClass() != classNode) {
if (!tryBridgeMethod(target, receiver, implicitThis, args, classNode)) {
@@ -379,7 +379,7 @@ public class StaticInvocationWriter extends InvocationWriter {
if (implicitThis
&& !classNode.isDerivedFrom(target.getDeclaringClass())
&& !classNode.implementsInterface(target.getDeclaringClass())
- && classNode instanceof InnerClassNode && controller.isInClosure()) {
+ && classNode instanceof InnerClassNode && controller.isInGeneratedFunction()) {
ClassNode current = classNode.getOuterClass();
fixedReceiver = new VariableExpression("thisObject", current);
// adjust for multiple levels of nesting if needed
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java
index e5e27bc..d8c6166 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java
@@ -311,7 +311,7 @@ public class StaticTypesBinaryExpressionMultiTypeDispatcher extends BinaryExpres
call.visit(controller.getAcg());
return true;
}
- if (isThisExpression && !controller.isInClosure()) {
+ if (isThisExpression && !controller.isInGeneratedFunction()) {
receiverType = controller.getClassNode();
}
if (makeSetPrivateFieldWithBridgeMethod(receiver, receiverType, property, arguments, safe, spreadSafe, implicitThis)) return true;
@@ -326,7 +326,7 @@ public class StaticTypesBinaryExpressionMultiTypeDispatcher extends BinaryExpres
ClassNode outerClass = receiverType.getOuterClass();
if (field == null && implicitThis && outerClass != null && !receiverType.isStaticClass()) {
Expression pexp;
- if (controller.isInClosure()) {
+ if (controller.isInGeneratedFunction()) {
MethodCallExpression mce = new MethodCallExpression(
new VariableExpression("this"),
"getThisObject",
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
index 3c09a11..973408b 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
@@ -388,7 +388,7 @@ public class StaticTypesCallSiteWriter extends CallSiteWriter implements Opcodes
ClassNode outerClass = receiverType.getOuterClass();
if (field == null && implicitThis && outerClass != null && !receiverType.isStaticClass()) {
Expression pexp;
- if (controller.isInClosure()) {
+ if (controller.isInGeneratedFunction()) {
MethodCallExpression mce = new MethodCallExpression(
new VariableExpression("this"),
"getThisObject",
@@ -434,7 +434,7 @@ public class StaticTypesCallSiteWriter extends CallSiteWriter implements Opcodes
TypeChooser typeChooser = controller.getTypeChooser();
ClassNode classNode = controller.getClassNode();
ClassNode receiverType = typeChooser.resolveType(receiver, classNode);
- if (receiver instanceof VariableExpression && ((VariableExpression) receiver).isThisExpression() && !controller.isInClosure()) {
+ if (receiver instanceof VariableExpression && ((VariableExpression) receiver).isThisExpression() && !controller.isInGeneratedFunction()) {
receiverType = classNode;
}
[groovy] 02/03: Trivial refactoring: adjust the return type
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit da6d819fd037e1b667e4299cdf8ceb3669357bf4
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Dec 21 19:13:41 2019 +0800
Trivial refactoring: adjust the return type
(cherry picked from commit cd3f874ed6cd801944c47fc2b1c0560c9971665b)
---
.../org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
index b582e2f..fc96361 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesLambdaWriter.java
@@ -200,7 +200,7 @@ public class StaticTypesLambdaWriter extends LambdaWriter implements AbstractFun
operandStack.replace(CLOSURE_TYPE, lambdaClassConstructorParameters.length);
}
- private Parameter[] loadSharedVariables(final LambdaExpression expression) {
+ private void loadSharedVariables(final LambdaExpression expression) {
Parameter[] lambdaSharedVariableParameters = expression.getNodeMetaData(LAMBDA_SHARED_VARIABLES);
for (Parameter parameter : lambdaSharedVariableParameters) {
@@ -209,8 +209,6 @@ public class StaticTypesLambdaWriter extends LambdaWriter implements AbstractFun
parameter.setNodeMetaData(UseExistingReference.class, Boolean.TRUE);
}
}
-
- return lambdaSharedVariableParameters;
}
private String createAbstractMethodDesc(final ClassNode functionalInterface, final ClassNode lambdaClass) {
[groovy] 01/03: GROOVY-9350: Bump javaparser to 3.15.7
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 7d6425d2bc1c0fb74be5a6eceef4ec9bd250397e
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Dec 21 18:59:41 2019 +0800
GROOVY-9350: Bump javaparser to 3.15.7
(cherry picked from commit 90ce07271086ed3beb5830c19a6d3fcf2b56a754)
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index a4627fe..ae14fe3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -141,7 +141,7 @@ ext {
ivyVersion = '2.5.0'
jansiVersion = '1.18'
jarjarVersion = '1.7.2'
- javaParserVersion = '3.15.6'
+ javaParserVersion = '3.15.7'
jlineVersion = '2.14.6'
jmockVersion = '1.2.0'
logbackVersion = '1.1.7'