You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2021/04/10 23:37:26 UTC
[groovy] branch GROOVY_3_0_X updated (b6549f4 -> 7b9297c)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from b6549f4 Merge pull request #1547 from JasonTypesCodes/mn-3.0-validation
new e538c6f GROOVY-9996: infer return type generics using declared type of variables (port to 3_0_X)
new 7b9297c GROOVY-10011: STC: instanceof refines declared type for diamond operator (closes #1545) (port to 3_0_X)
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:
.../transform/stc/StaticTypeCheckingVisitor.java | 14 ++++++++-
.../groovy/transform/stc/GenericsSTCTest.groovy | 36 ++++++++++++++++++++++
2 files changed, 49 insertions(+), 1 deletion(-)
[groovy] 01/02: GROOVY-9996: infer return type generics using
declared type of variables (port to 3_0_X)
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit e538c6f6a9edfae2e1651361d2652943b7467b23
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Mar 23 10:20:45 2021 -0500
GROOVY-9996: infer return type generics using declared type of variables (port to 3_0_X)
---
.../groovy/transform/stc/StaticTypeCheckingVisitor.java | 10 +++++++++-
src/test/groovy/transform/stc/GenericsSTCTest.groovy | 17 +++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
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 5d4bc3f..e025180 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -5183,7 +5183,7 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
for (int i = 0; i < paramLength; i += 1) {
boolean lastArg = (i == paramLength - 1);
ClassNode paramType = parameters[i].getType();
- ClassNode argumentType = getType(expressions.get(i));
+ ClassNode argumentType = getDeclaredOrInferredType(expressions.get(i));
while (paramType.isArray() && argumentType.isArray()) {
paramType = paramType.getComponentType();
argumentType = argumentType.getComponentType();
@@ -5446,6 +5446,14 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
return resolveClassNodeGenerics(resolvedPlaceholders, placeholdersFromContext, currentType);
}
+ private ClassNode getDeclaredOrInferredType(final Expression expression) {
+ // in case of "T t = new ExtendsOrImplementsT()", return T for the expression type
+ if (expression instanceof Variable && !((Variable) expression).isDynamicTyped()) {
+ return getOriginalDeclarationType(expression); // GROOVY-9996
+ }
+ return getInferredTypeFromTempInfo(expression, getType(expression));
+ }
+
private static ClassNode getDeclaringClass(final MethodNode method, final Expression arguments) {
ClassNode declaringClass = method.getDeclaringClass();
diff --git a/src/test/groovy/transform/stc/GenericsSTCTest.groovy b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
index 2c0b7bd..b5020e3 100644
--- a/src/test/groovy/transform/stc/GenericsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
@@ -196,6 +196,23 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
'''
}
+ // GROOVY-9996
+ void testDiamondInferrenceFromConstructor8a() {
+ assertScript '''
+ @groovy.transform.TupleConstructor(defaults=false)
+ class C<T> {
+ T p
+ }
+ interface I { }
+ class D implements I { }
+ void test(C<I> c) { assert c.p instanceof D }
+
+ I i = new D() // infers D for "i"
+ def ci = new C<>(i) // infers C<D> for "ci"
+ test(ci)
+ '''
+ }
+
void testLinkedListWithListArgument() {
assertScript '''
List<String> list = new LinkedList<String>(['1','2','3'])
[groovy] 02/02: GROOVY-10011: STC: instanceof refines declared type
for diamond operator (closes #1545) (port to 3_0_X)
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 7b9297cfd639ba14225c99299700706cdd35381b
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Apr 6 08:59:31 2021 -0500
GROOVY-10011: STC: instanceof refines declared type for diamond operator (closes #1545) (port to 3_0_X)
---
.../transform/stc/StaticTypeCheckingVisitor.java | 8 ++++++--
src/test/groovy/transform/stc/GenericsSTCTest.groovy | 19 +++++++++++++++++++
2 files changed, 25 insertions(+), 2 deletions(-)
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 e025180..49f5353 100644
--- a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -5447,11 +5447,15 @@ public class StaticTypeCheckingVisitor extends ClassCodeVisitorSupport {
}
private ClassNode getDeclaredOrInferredType(final Expression expression) {
+ ClassNode declaredOrInferred;
// in case of "T t = new ExtendsOrImplementsT()", return T for the expression type
if (expression instanceof Variable && !((Variable) expression).isDynamicTyped()) {
- return getOriginalDeclarationType(expression); // GROOVY-9996
+ declaredOrInferred = getOriginalDeclarationType(expression); // GROOVY-9996
+ } else {
+ declaredOrInferred = getType(expression);
}
- return getInferredTypeFromTempInfo(expression, getType(expression));
+ // GROOVY-10011: apply instanceof constraints to either option
+ return getInferredTypeFromTempInfo(expression, declaredOrInferred);
}
private static ClassNode getDeclaringClass(final MethodNode method, final Expression arguments) {
diff --git a/src/test/groovy/transform/stc/GenericsSTCTest.groovy b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
index b5020e3..be9319e 100644
--- a/src/test/groovy/transform/stc/GenericsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
@@ -213,6 +213,25 @@ class GenericsSTCTest extends StaticTypeCheckingTestCase {
'''
}
+ // GROOVY-10011
+ void testDiamondInferrenceFromConstructor8b() {
+ assertScript '''
+ @groovy.transform.TupleConstructor(defaults=false)
+ class C<T> {
+ T p
+ }
+ interface I { }
+ class D implements I { }
+
+ void test(I i) {
+ if (i instanceof D) {
+ C<D> cd = new C<>(i)
+ }
+ }
+ test(new D())
+ '''
+ }
+
void testLinkedListWithListArgument() {
assertScript '''
List<String> list = new LinkedList<String>(['1','2','3'])