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 2018/05/26 06:57:06 UTC
groovy git commit: Minor refactoring: use another extracting
placeholder logic(closes #726)
Repository: groovy
Updated Branches:
refs/heads/master 3460faf0f -> ea462f1e9
Minor refactoring: use another extracting placeholder logic(closes #726)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ea462f1e
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ea462f1e
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ea462f1e
Branch: refs/heads/master
Commit: ea462f1e97fa9a607b3e659e89c89f447d24664c
Parents: 3460faf
Author: sunlan <su...@apache.org>
Authored: Sat May 26 14:50:20 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Sat May 26 14:56:28 2018 +0800
----------------------------------------------------------------------
.../codehaus/groovy/ast/tools/GeneralUtils.java | 52 +++++++++++++++
.../stc/StaticTypeCheckingSupport.java | 55 +---------------
.../stc/StaticTypeCheckingVisitor.java | 19 +++---
src/test/groovy/bugs/Groovy7204Bug.groovy | 69 ++++++++++++++------
4 files changed, 115 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/ea462f1e/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
index b45952e..c0082bf 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -24,6 +24,7 @@ import org.codehaus.groovy.ast.AnnotationNode;
import org.codehaus.groovy.ast.ClassHelper;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.FieldNode;
+import org.codehaus.groovy.ast.GenericsType;
import org.codehaus.groovy.ast.MethodNode;
import org.codehaus.groovy.ast.PackageNode;
import org.codehaus.groovy.ast.Parameter;
@@ -68,6 +69,7 @@ import org.codehaus.groovy.transform.AbstractASTTransformation;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -876,4 +878,54 @@ public class GeneralUtils {
return ((firstPackage == null && secondPackage == null) ||
firstPackage != null && secondPackage != null && firstPackage.getName().equals(secondPackage.getName()));
}
+
+ /**
+ * map declaring generics type to actual generics type, e.g. GROOVY-7204:
+ * declaring generics types: T, S extends Serializable
+ * actual generics types : String, Long
+ *
+ * the result map is [
+ * T: String,
+ * S: Long
+ * ]
+ *
+ * The resolved types can not help us to choose methods correctly if the argument is a string: T: Object, S: Serializable
+ * so we need actual types: T: String, S: Long
+ */
+ public static Map<GenericsType, GenericsType> makeDeclaringAndActualGenericsTypeMap(ClassNode declaringClass, ClassNode actualReceiver) {
+ ClassNode parameterizedType = GenericsUtils.findParameterizedTypeFromCache(declaringClass, actualReceiver);
+
+ if (null == parameterizedType) {
+ return Collections.emptyMap();
+ }
+
+ GenericsType[] declaringGenericsTypes = declaringClass.getGenericsTypes();
+ GenericsType[] actualGenericsTypes = parameterizedType.getGenericsTypes();
+
+ Map<GenericsType, GenericsType> result = new LinkedHashMap<>();
+ for (int i = 0, n = declaringGenericsTypes.length; i < n; i++) {
+ result.put(declaringGenericsTypes[i], actualGenericsTypes[i]);
+ }
+
+ return result;
+ }
+
+ /**
+ * Get the actual type according to the placeholder name
+ *
+ * @param placeholderName the placeholder name, e.g. T, E
+ * @param genericsPlaceholderAndTypeMap the result of {@link #makeDeclaringAndActualGenericsTypeMap(ClassNode, ClassNode}
+ * @return the actual type
+ */
+ public static ClassNode findActualTypeByGenericsPlaceholderName(String placeholderName, Map<GenericsType, GenericsType> genericsPlaceholderAndTypeMap) {
+ for (Map.Entry<GenericsType, GenericsType> entry : genericsPlaceholderAndTypeMap.entrySet()) {
+ GenericsType declaringGenericsType = entry.getKey();
+
+ if (placeholderName.equals(declaringGenericsType.getName())) {
+ return entry.getValue().getType().redirect();
+ }
+ }
+
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/ea462f1e/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
index 6a5245b..c5ee2fe 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -36,6 +36,7 @@ import org.codehaus.groovy.ast.expr.ListExpression;
import org.codehaus.groovy.ast.expr.MapExpression;
import org.codehaus.groovy.ast.expr.VariableExpression;
import org.codehaus.groovy.ast.stmt.ReturnStatement;
+import org.codehaus.groovy.ast.tools.GeneralUtils;
import org.codehaus.groovy.ast.tools.GenericsUtils;
import org.codehaus.groovy.ast.tools.ParameterUtils;
import org.codehaus.groovy.ast.tools.WideningCategories;
@@ -62,7 +63,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -1100,7 +1100,7 @@ public abstract class StaticTypeCheckingSupport {
Person p = foo(b)
*/
- Map<GenericsType, GenericsType> declaringAndActualGenericsTypeMap = makeDeclaringAndActualGenericsTypeMap(declaringClassForDistance, actualReceiverForDistance);
+ Map<GenericsType, GenericsType> declaringAndActualGenericsTypeMap = GeneralUtils.makeDeclaringAndActualGenericsTypeMap(declaringClassForDistance, actualReceiverForDistance);
Parameter[] params = makeRawTypes(safeNode.getParameters(), declaringAndActualGenericsTypeMap);
int dist = measureParametersAndArgumentsDistance(params, safeArgs);
if (dist >= 0) {
@@ -1191,62 +1191,13 @@ public abstract class StaticTypeCheckingSupport {
return isExtensionMethodNode ? 0 : 1;
}
- private static ClassNode findActualTypeByGenericsPlaceholderName(String placeholderName, Map<GenericsType, GenericsType> genericsPlaceholderAndTypeMap) {
- for (Map.Entry<GenericsType, GenericsType> entry : genericsPlaceholderAndTypeMap.entrySet()) {
- GenericsType declaringGenericsType = entry.getKey();
-
- if (placeholderName.equals(declaringGenericsType.getName())) {
- return entry.getValue().getType();
- }
- }
-
- return null;
- }
-
- public static ClassNode findActualTypeByPlaceholderName(String placeholderName, Map<String, GenericsType> placeholderInfo) {
- GenericsType gt = placeholderInfo.get(placeholderName);
-
- return null == gt ? null : gt.getType().redirect();
- }
-
- /**
- * map declaring generics type to actual generics type, e.g. GROOVY-7204:
- * declaring generics types: T, S extends Serializable
- * actual generics types : String, Long
- *
- * the result map is [
- * T: String,
- * S: Long
- * ]
- *
- * The resolved types can not help us to choose methods correctly if the argument is a string: T: Object, S: Serializable
- * so we need actual types: T: String, S: Long
- */
- private static Map<GenericsType, GenericsType> makeDeclaringAndActualGenericsTypeMap(ClassNode declaringClass, ClassNode actualReceiver) {
- ClassNode parameterizedType = GenericsUtils.findParameterizedType(declaringClass, actualReceiver);
-
- if (null == parameterizedType) {
- return Collections.emptyMap();
- }
-
- GenericsType[] declaringGenericsTypes = declaringClass.getGenericsTypes();
- GenericsType[] actualGenericsTypes = parameterizedType.getGenericsTypes();
-
- Map<GenericsType, GenericsType> result = new LinkedHashMap<>();
- for (int i = 0, n = declaringGenericsTypes.length; i < n; i++) {
- result.put(declaringGenericsTypes[i], actualGenericsTypes[i]);
- }
-
- return result;
- }
-
private static Parameter[] makeRawTypes(Parameter[] params, Map<GenericsType, GenericsType> genericsPlaceholderAndTypeMap) {
Parameter[] newParam = new Parameter[params.length];
for (int i = 0; i < params.length; i++) {
Parameter oldP = params[i];
- ClassNode actualType = findActualTypeByGenericsPlaceholderName(oldP.getType().getUnresolvedName(), genericsPlaceholderAndTypeMap);
+ ClassNode actualType = GeneralUtils.findActualTypeByGenericsPlaceholderName(oldP.getType().getUnresolvedName(), genericsPlaceholderAndTypeMap);
Parameter newP = new Parameter(makeRawType(null == actualType ? oldP.getType() : actualType), oldP.getName());
newParam[i] = newP;
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/ea462f1e/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
----------------------------------------------------------------------
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 96faeb9..6300deb 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -169,6 +169,8 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.args;
import static org.codehaus.groovy.ast.tools.GeneralUtils.binX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.callX;
import static org.codehaus.groovy.ast.tools.GeneralUtils.castX;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.findActualTypeByGenericsPlaceholderName;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.makeDeclaringAndActualGenericsTypeMap;
import static org.codehaus.groovy.ast.tools.GeneralUtils.varX;
import static org.codehaus.groovy.ast.tools.GenericsUtils.toGenericTypesString;
import static org.codehaus.groovy.ast.tools.WideningCategories.LowestUpperBoundClassNode;
@@ -221,7 +223,6 @@ import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.choose
import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.evaluateExpression;
import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.extractGenericsConnections;
import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.extractGenericsParameterMapOfThis;
-import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.findActualTypeByPlaceholderName;
import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.findDGMMethodsByNameAndArguments;
import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.findSetters;
import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.findTargetVariable;
@@ -623,15 +624,15 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
}
}
- ClassNode parameterizedType = GenericsUtils.findParameterizedTypeFromCache(fieldNode.getDeclaringClass(), typeCheckingContext.getEnclosingClassNode());
- if (null != parameterizedType) {
- ClassNode originalType = fieldNode.getOriginType();
- ClassNode actualType = findActualTypeByPlaceholderName(originalType.getUnresolvedName(), GenericsUtils.extractPlaceholders(parameterizedType));
+ ClassNode actualType =
+ findActualTypeByGenericsPlaceholderName(
+ fieldNode.getOriginType().getUnresolvedName(),
+ makeDeclaringAndActualGenericsTypeMap(fieldNode.getDeclaringClass(), typeCheckingContext.getEnclosingClassNode())
+ );
- if (null != actualType) {
- storeType(vexp, actualType);
- return;
- }
+ if (null != actualType) {
+ storeType(vexp, actualType);
+ return;
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/ea462f1e/src/test/groovy/bugs/Groovy7204Bug.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/bugs/Groovy7204Bug.groovy b/src/test/groovy/bugs/Groovy7204Bug.groovy
index 09375ac..b297112 100644
--- a/src/test/groovy/bugs/Groovy7204Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7204Bug.groovy
@@ -16,25 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-/*
- * 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
class Groovy7204Bug extends GroovyTestCase {
@@ -543,4 +524,54 @@ class Groovy7204Bug extends GroovyTestCase {
test()
'''
}
+
+ void testCompileStatic7() {
+ assertScript '''
+ @groovy.transform.CompileStatic
+ class Trie<T> {}
+
+ @groovy.transform.CompileStatic
+ class Base<T> {
+ protected List<Trie<T>> list
+
+ Base() {
+ list = new ArrayList<Trie<T>>()
+ list.add(new Trie<String>())
+ }
+ }
+
+ @groovy.transform.CompileStatic
+ class Derived extends Base<String> {
+ Trie<String> getFirstElement() {
+ list.get(0)
+ }
+ }
+
+ assert new Derived().getFirstElement() instanceof Trie
+ '''
+ }
+
+ void testCompileStatic8() {
+ assertScript '''
+ @groovy.transform.CompileStatic
+ class Trie<T> {}
+
+ @groovy.transform.CompileStatic
+ class Base<T> extends ArrayList<Trie<T>> {
+
+ Base() {
+ this.add(new Trie<String>())
+ }
+ }
+
+ @groovy.transform.CompileStatic
+ class Derived extends Base<String> {
+ Trie<String> getFirstElement() {
+ this.get(0)
+ }
+ }
+
+ assert new Derived().getFirstElement() instanceof Trie
+ '''
+ }
}