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 2020/08/09 01:45:17 UTC
[groovy] branch danielsun/fix-3_0_0 updated (c71fda9 -> 6537438)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch danielsun/fix-3_0_0
in repository https://gitbox.apache.org/repos/asf/groovy.git.
omit c71fda9 minor refactor
new 1069bbd Trigger grails joint build
new 6537438 minor refactor
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c71fda9)
\
N -- N -- N refs/heads/danielsun/fix-3_0_0 (6537438)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
.github/workflows/grails-joint-validation.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[groovy] 01/02: Trigger grails joint build
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/fix-3_0_0
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 1069bbd4a120d102ea76d480eeeb1d0bd4f76fc7
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Aug 9 09:44:06 2020 +0800
Trigger grails joint build
---
.github/workflows/grails-joint-validation.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/grails-joint-validation.yml b/.github/workflows/grails-joint-validation.yml
index 1d3c168..902be57 100644
--- a/.github/workflows/grails-joint-validation.yml
+++ b/.github/workflows/grails-joint-validation.yml
@@ -21,12 +21,12 @@ on:
push:
branches:
- GROOVY_2_5_X
- - GROOVY_3_0_X
+ - danielsun/fix-3_0_0
# - master
pull_request:
branches:
- GROOVY_2_5_X
- - GROOVY_3_0_X
+ - danielsun/fix-3_0_0
# - master
jobs:
build:
@@ -48,7 +48,7 @@ jobs:
# Select correct Grails branch for this build:
- name: Checkout Grails 4.1.x (master)
run: cd .. && git clone --depth 1 https://github.com/grails/grails-core.git -b master
- if: ${{ github.ref == 'refs/heads/GROOVY_3_0_X' }}
+ if: ${{ github.ref == 'refs/heads/danielsun/fix-3_0_0' }}
- name: Checkout Grails 4.0.x (4.0.x)
run: cd .. && git clone --depth 1 https://github.com/grails/grails-core.git -b 4.0.x
if: ${{ github.ref == 'refs/heads/GROOVY_2_5_X' }}
[groovy] 02/02: minor refactor
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/fix-3_0_0
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 6537438ffd90231dc36c54b4118b7c720a7d0d9c
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Wed Aug 5 16:49:08 2020 -0500
minor refactor
(cherry picked from commit 3aad26c5cff180872111258074b5383bff9a7a0b)
---
.../transform/trait/SuperCallTraitTransformer.java | 119 ++++++++++-----------
1 file changed, 54 insertions(+), 65 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java b/src/main/java/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java
index 7e6e090..76f5782 100644
--- a/src/main/java/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java
+++ b/src/main/java/org/codehaus/groovy/transform/trait/SuperCallTraitTransformer.java
@@ -36,8 +36,6 @@ import org.codehaus.groovy.ast.expr.VariableExpression;
import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.syntax.Types;
-import java.util.List;
-
import static org.objectweb.asm.Opcodes.ACC_ABSTRACT;
import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
import static org.objectweb.asm.Opcodes.ACC_STATIC;
@@ -49,7 +47,9 @@ import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC;
* @since 2.3.0
*/
class SuperCallTraitTransformer extends ClassCodeExpressionTransformer {
+
static final String UNRESOLVED_HELPER_CLASS = "UNRESOLVED_HELPER_CLASS";
+
private final SourceUnit unit;
SuperCallTraitTransformer(final SourceUnit unit) {
@@ -63,12 +63,12 @@ class SuperCallTraitTransformer extends ClassCodeExpressionTransformer {
@Override
public Expression transform(final Expression exp) {
- if (exp instanceof MethodCallExpression) {
- return transformMethodCallExpression((MethodCallExpression)exp);
- }
if (exp instanceof BinaryExpression) {
return transformBinaryExpression((BinaryExpression) exp);
}
+ if (exp instanceof MethodCallExpression) {
+ return transformMethodCallExpression((MethodCallExpression) exp);
+ }
return super.transform(exp);
}
@@ -76,38 +76,33 @@ class SuperCallTraitTransformer extends ClassCodeExpressionTransformer {
Expression trn = super.transform(exp);
if (trn instanceof BinaryExpression) {
BinaryExpression bin = (BinaryExpression) trn;
- Expression leftExpression = bin.getLeftExpression();
- if (bin.getOperation().getType() == Types.EQUAL && leftExpression instanceof PropertyExpression) {
- ClassNode traitReceiver = null;
- PropertyExpression leftPropertyExpression = (PropertyExpression) leftExpression;
- if (isTraitSuperPropertyExpression(leftPropertyExpression.getObjectExpression())) {
- PropertyExpression pexp = (PropertyExpression) leftPropertyExpression.getObjectExpression();
- traitReceiver = pexp.getObjectExpression().getType();
- }
- if (traitReceiver!=null) {
- // A.super.foo = ...
- TraitHelpersTuple helpers = Traits.findHelpers(traitReceiver);
- ClassNode helper = helpers.getHelper();
- String setterName = MetaProperty.getSetterName(leftPropertyExpression.getPropertyAsString());
- List<MethodNode> methods = helper.getMethods(setterName);
- for (MethodNode method : methods) {
+ if (bin.getOperation().getType() == Types.ASSIGN && bin.getLeftExpression() instanceof PropertyExpression) {
+ PropertyExpression leftExpression = (PropertyExpression) bin.getLeftExpression();
+ ClassNode traitType = getTraitSuperTarget(leftExpression.getObjectExpression());
+ if (traitType != null) {
+ // TraitType.super.foo = ... -> TraitType$Helper.setFoo(this, ...)
+
+ ClassNode helperType = getHelper(traitType);
+ String setterName = MetaProperty.getSetterName(leftExpression.getPropertyAsString());
+ for (MethodNode method : helperType.getMethods(setterName)) {
Parameter[] parameters = method.getParameters();
- if (parameters.length==2 && parameters[0].getType().equals(traitReceiver)) {
- ArgumentListExpression args = new ArgumentListExpression(
- new VariableExpression("this"),
- transform(exp.getRightExpression())
- );
+ if (parameters.length == 2 && parameters[0].getType().equals(traitType)) {
MethodCallExpression setterCall = new MethodCallExpression(
- new ClassExpression(helper),
+ new ClassExpression(helperType),
setterName,
- args
+ new ArgumentListExpression(
+ new VariableExpression("this"),
+ bin.getRightExpression()
+ )
);
+ setterCall.getMethod().setSourcePosition(leftExpression.getProperty());
+ setterCall.getObjectExpression().setSourcePosition(traitType);
+ setterCall.setSpreadSafe(leftExpression.isSpreadSafe());
setterCall.setMethodTarget(method);
setterCall.setImplicitThis(false);
return setterCall;
}
}
- return bin;
}
}
}
@@ -115,44 +110,37 @@ class SuperCallTraitTransformer extends ClassCodeExpressionTransformer {
}
private Expression transformMethodCallExpression(final MethodCallExpression exp) {
- if (isTraitSuperPropertyExpression(exp.getObjectExpression())) {
- Expression objectExpression = exp.getObjectExpression();
- ClassNode traitReceiver = ((PropertyExpression) objectExpression).getObjectExpression().getType();
-
- if (traitReceiver != null) {
- // (SomeTrait.super).foo() --> SomeTrait$Helper.foo(this)
- ClassExpression receiver = new ClassExpression(
- getHelper(traitReceiver)
- );
- ArgumentListExpression newArgs = new ArgumentListExpression();
- Expression arguments = exp.getArguments();
- newArgs.addExpression(new VariableExpression("this"));
- if (arguments instanceof TupleExpression) {
- List<Expression> expressions = ((TupleExpression) arguments).getExpressions();
- for (Expression expression : expressions) {
- newArgs.addExpression(transform(expression));
- }
- } else {
- newArgs.addExpression(transform(arguments));
+ ClassNode traitType = getTraitSuperTarget(exp.getObjectExpression());
+ if (traitType != null) {
+ // TraitType.super.foo() -> TraitType$Helper.foo(this)
+
+ ArgumentListExpression newArgs = new ArgumentListExpression();
+ newArgs.addExpression(new VariableExpression("this"));
+ Expression arguments = exp.getArguments();
+ if (arguments instanceof TupleExpression) {
+ for (Expression expression : (TupleExpression) arguments) {
+ newArgs.addExpression(transform(expression));
}
- MethodCallExpression result = new MethodCallExpression(
- receiver,
- transform(exp.getMethod()),
- newArgs
- );
- result.setImplicitThis(false);
- result.setSpreadSafe(exp.isSpreadSafe());
- result.setSafe(exp.isSafe());
- result.setSourcePosition(exp);
- return result;
+ } else {
+ newArgs.addExpression(transform(arguments));
}
+
+ MethodCallExpression newCall = new MethodCallExpression(
+ new ClassExpression(getHelper(traitType)),
+ transform(exp.getMethod()),
+ newArgs
+ );
+ newCall.getObjectExpression().setSourcePosition(traitType);
+ newCall.setSpreadSafe(exp.isSpreadSafe());
+ newCall.setImplicitThis(false);
+ return newCall;
}
return super.transform(exp);
}
private ClassNode getHelper(final ClassNode traitReceiver) {
if (helperClassNotCreatedYet(traitReceiver)) {
- // GROOVY-7909 A Helper class in same compilation unit may have not been created when referenced
+ // GROOVY-7909: A Helper class in same compilation unit may have not been created when referenced
// Here create a symbol as a "placeholder" and it will be resolved later.
ClassNode ret = new InnerClassNode(
traitReceiver,
@@ -174,19 +162,20 @@ class SuperCallTraitTransformer extends ClassCodeExpressionTransformer {
private boolean helperClassNotCreatedYet(final ClassNode traitReceiver) {
return !traitReceiver.redirect().getInnerClasses().hasNext()
- && this.unit.getAST().getClasses().contains(traitReceiver.redirect());
+ && getSourceUnit().getAST().getClasses().contains(traitReceiver.redirect());
}
- private boolean isTraitSuperPropertyExpression(Expression exp) {
+
+ private ClassNode getTraitSuperTarget(final Expression exp) {
if (exp instanceof PropertyExpression) {
PropertyExpression pexp = (PropertyExpression) exp;
- Expression objectExpression = pexp.getObjectExpression();
- if (objectExpression instanceof ClassExpression) {
- ClassNode type = objectExpression.getType();
+ Expression objExp = pexp.getObjectExpression();
+ if (objExp instanceof ClassExpression) {
+ ClassNode type = objExp.getType();
if (Traits.isTrait(type) && "super".equals(pexp.getPropertyAsString())) {
- return true;
+ return type;
}
}
}
- return false;
+ return null;
}
}