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/08/01 14:41:48 UTC
[groovy] branch GROOVY_2_5_X updated (d5c3474 -> 0a2ea74)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from d5c3474 [GROOVY-9109] Don't leak CompilerConfiguration from GroovyClassLoader
new a4a6bb8 GROOVY-8169: preserve origin type of for loop variable
new 3715b31 GROOVY-9136: set source position of object expression for error messages
new 0a2ea74 GROOVY-8819: set source position of property's new constant expression
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:
.../groovy/control/StaticImportVisitor.java | 7 ++--
.../transform/sc/StaticCompilationVisitor.java | 1 -
.../VariableExpressionTransformer.java | 10 ++++--
.../bugs/{Groovy9184.groovy => Groovy8169.groovy} | 38 ++++++++++++----------
4 files changed, 31 insertions(+), 25 deletions(-)
copy src/test/groovy/bugs/{Groovy9184.groovy => Groovy8169.groovy} (53%)
[groovy] 03/03: GROOVY-8819: set source position of property's new
constant expression
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0a2ea74bcceeeedfc08a8252f83680bd0c2cd0a9
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Thu Jul 11 00:03:47 2019 +0800
GROOVY-8819: set source position of property's new constant expression
(cherry picked from commit 18d87630b662c6a583469aa0c1188eecdbcc550d)
---
src/main/java/org/codehaus/groovy/control/StaticImportVisitor.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/control/StaticImportVisitor.java b/src/main/java/org/codehaus/groovy/control/StaticImportVisitor.java
index 932f057..cbe28f9 100644
--- a/src/main/java/org/codehaus/groovy/control/StaticImportVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/StaticImportVisitor.java
@@ -51,15 +51,15 @@ import org.codehaus.groovy.syntax.Types;
import java.util.List;
import java.util.Map;
+import static org.apache.groovy.ast.tools.ClassNodeUtils.getField;
import static org.apache.groovy.ast.tools.ClassNodeUtils.getPropNameForAccessor;
import static org.apache.groovy.ast.tools.ClassNodeUtils.hasPossibleStaticMethod;
import static org.apache.groovy.ast.tools.ClassNodeUtils.hasPossibleStaticProperty;
import static org.apache.groovy.ast.tools.ClassNodeUtils.hasStaticProperty;
import static org.apache.groovy.ast.tools.ClassNodeUtils.isInnerClass;
import static org.apache.groovy.ast.tools.ClassNodeUtils.isValidAccessorName;
-import static org.codehaus.groovy.runtime.MetaClassHelper.capitalize;
-import static org.apache.groovy.ast.tools.ClassNodeUtils.getField;
import static org.apache.groovy.ast.tools.ExpressionUtils.transformInlineConstants;
+import static org.apache.groovy.util.BeanUtils.capitalize;
import static org.codehaus.groovy.ast.tools.ClosureUtils.getParametersSafe;
/**
@@ -214,8 +214,7 @@ public class StaticImportVisitor extends ClassCodeExpressionTransformer {
ClassNode declaringClass = fn.getDeclaringClass();
if (fn.isStatic() && currentClass.isDerivedFrom(declaringClass)) {
Expression result = new PropertyExpression(new ClassExpression(declaringClass), v.getName());
- result.setSourcePosition(ve);
-
+ setSourcePosition(result, ve);
return result;
}
}
[groovy] 01/03: GROOVY-8169: preserve origin type of for loop
variable
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit a4a6bb84e9f4f56ee7568fdc6f79b0e2bdf5af39
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sat Jul 20 14:17:17 2019 -0500
GROOVY-8169: preserve origin type of for loop variable
(cherry picked from commit a7ed2174d003691dbadc3c31b8c4e2636a6f2b49)
---
.../transform/sc/StaticCompilationVisitor.java | 1 -
src/test/groovy/bugs/Groovy8169.groovy | 50 ++++++++++++++++++++++
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java b/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
index bc5ce96..f78f1c3 100644
--- a/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/sc/StaticCompilationVisitor.java
@@ -449,7 +449,6 @@ public class StaticCompilationVisitor extends StaticTypeCheckingVisitor {
componentType = inferLoopElementType(collectionType);
}
forLoop.getVariable().setType(componentType);
- forLoop.getVariable().setOriginType(componentType);
}
}
diff --git a/src/test/groovy/bugs/Groovy8169.groovy b/src/test/groovy/bugs/Groovy8169.groovy
new file mode 100644
index 0000000..1db9c03
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy8169.groovy
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package groovy.bugs
+
+import groovy.transform.CompileStatic
+import org.junit.Test
+
+import static groovy.test.GroovyAssert.assertScript
+
+@CompileStatic
+final class Groovy8169 {
+
+ @Test
+ void testForLoopVariableRetainsOriginType() {
+ assertScript '''
+ import groovy.transform.*
+ import org.codehaus.groovy.ast.stmt.*
+ import static org.codehaus.groovy.ast.ClassHelper.*
+ import static org.codehaus.groovy.control.CompilePhase.*
+
+ @ASTTest(phase=CLASS_GENERATION, value={
+ def loop = node.code.statements.find { it instanceof ForStatement }
+ assert loop.variable.originType == OBJECT_TYPE
+ assert loop.variable.type == STRING_TYPE
+ })
+ @CompileStatic
+ void m() {
+ List strings = ['one', 'two']
+ for (Object s in strings) {
+ }
+ }
+ '''
+ }
+}
[groovy] 02/03: GROOVY-9136: set source position of object
expression for error messages
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 3715b31caf6b5d1d33bdcfa70f4e5d41802dd6ef
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sat Jul 20 11:44:16 2019 -0500
GROOVY-9136: set source position of object expression for error messages
Set only line and column to prevent overlap with property expression.
(cherry picked from commit 7e496edb4413c0fd6520e95eb6b8449fa0ecedd7)
---
.../sc/transformers/VariableExpressionTransformer.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java b/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
index 6e490c1..84aeb72 100644
--- a/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
+++ b/src/main/java/org/codehaus/groovy/transform/sc/transformers/VariableExpressionTransformer.java
@@ -50,18 +50,24 @@ public class VariableExpressionTransformer {
// processClassVariable before it reaches any makeCall, that could handle it
Object val = expr.getNodeMetaData(StaticTypesMarker.IMPLICIT_RECEIVER);
if (val == null) return null;
+
// TODO handle the owner and delegate cases better for nested scenarios and potentially remove the need for the implicit this case
VariableExpression receiver = new VariableExpression("owner".equals(val) ? (String) val : "delegate".equals(val) ? (String) val : "this");
- receiver.setSourcePosition(expr);
+ // GROOVY-9136 -- object expression should not overlap source range of property; property stands in for original varibale expression
+ receiver.setLineNumber(expr.getLineNumber());
+ receiver.setColumnNumber(expr.getColumnNumber());
+
PropertyExpression pexp = new PropertyExpression(receiver, expr.getName());
+ pexp.getProperty().setSourcePosition(expr);
pexp.copyNodeMetaData(expr);
pexp.setImplicitThis(true);
- pexp.getProperty().setSourcePosition(expr);
+
ClassNode owner = expr.getNodeMetaData(StaticCompilationMetadataKeys.PROPERTY_OWNER);
if (owner != null) {
receiver.putNodeMetaData(StaticTypesMarker.INFERRED_TYPE, owner);
receiver.putNodeMetaData(StaticTypesMarker.IMPLICIT_RECEIVER, val);
}
+
return pexp;
}