groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From emil...@apache.org
Subject [groovy] branch GROOVY_2_4_X updated: GROOVY-7985: fix for "incompatible generic type" error
Date Fri, 13 Dec 2019 22:40:49 GMT
This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch GROOVY_2_4_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_2_4_X by this push:
     new 4456480  GROOVY-7985: fix for "incompatible generic type" error
4456480 is described below

commit 4456480dc18efb854195805368fb8e7afc61bcf5
Author: Daniel Sun <sunlan@apache.org>
AuthorDate: Fri Dec 13 16:32:26 2019 -0600

    GROOVY-7985: fix for "incompatible generic type" error
---
 .../codehaus/groovy/ast/tools/GenericsUtils.java   | 32 +++++++-----
 src/test/groovy/bugs/Groovy7985.groovy             | 60 ++++++++++++++++++++++
 2 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/src/main/org/codehaus/groovy/ast/tools/GenericsUtils.java b/src/main/org/codehaus/groovy/ast/tools/GenericsUtils.java
index c8e0f8d..25494b4 100644
--- a/src/main/org/codehaus/groovy/ast/tools/GenericsUtils.java
+++ b/src/main/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -157,6 +157,8 @@ public class GenericsUtils {
         GenericsType[] redirectGenericsTypes = node.redirect().getGenericsTypes();
         if (redirectGenericsTypes==null) redirectGenericsTypes = parameterized;
         if (parameterized.length != redirectGenericsTypes.length) return;
+
+        List<GenericsType> valueList = new ArrayList<GenericsType>();
         for (int i = 0; i < redirectGenericsTypes.length; i++) {
             GenericsType redirectType = redirectGenericsTypes[i];
             if (redirectType.isPlaceholder()) {
@@ -164,21 +166,25 @@ public class GenericsUtils {
                 if (!map.containsKey(name)) {
                     GenericsType value = parameterized[i];
                     map.put(name, value);
-                    if (value.isWildcard()) {
-                        ClassNode lowerBound = value.getLowerBound();
-                        if (lowerBound!=null) {
-                            extractPlaceholders(lowerBound, map);
-                        }
-                        ClassNode[] upperBounds = value.getUpperBounds();
-                        if (upperBounds!=null) {
-                            for (ClassNode upperBound : upperBounds) {
-                                extractPlaceholders(upperBound, map);
-                            }
-                        }
-                    } else if (!value.isPlaceholder()) {
-                        extractPlaceholders(value.getType(), map);
+                    valueList.add(value);
+                }
+            }
+        }
+
+        for (GenericsType value : valueList) {
+            if (value.isWildcard()) {
+                ClassNode lowerBound = value.getLowerBound();
+                if (lowerBound != null) {
+                    extractPlaceholders(lowerBound, map);
+                }
+                ClassNode[] upperBounds = value.getUpperBounds();
+                if (upperBounds != null) {
+                    for (ClassNode upperBound : upperBounds) {
+                        extractPlaceholders(upperBound, map);
                     }
                 }
+            } else if (!value.isPlaceholder()) {
+                extractPlaceholders(value.getType(), map);
             }
         }
     }
diff --git a/src/test/groovy/bugs/Groovy7985.groovy b/src/test/groovy/bugs/Groovy7985.groovy
new file mode 100644
index 0000000..ec5a087
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy7985.groovy
@@ -0,0 +1,60 @@
+/*
+ *  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 Groovy7985 {
+
+    @Test
+    void testGenericsCompatibility() {
+        assertScript '''
+            @groovy.transform.CompileStatic
+            class Pair<L, R> implements Serializable {
+                public final L left
+                public final R right
+
+                private Pair(final L left, final R right) {
+                    this.left = left
+                    this.right = right
+                }
+
+                static <L, R> Pair<L, R> of(final L left, final R right) {
+                    return new Pair<>(left, right)
+                }
+            }
+
+            @groovy.transform.CompileStatic
+            Pair<Pair<String, Integer>, Pair<String, Integer>> doSmething()
{
+                def one = (Pair<String, Integer>) Pair.of('a', 1)
+                def two = (Pair<String, Integer>) Pair.of('b', 2)
+                return Pair.of(one, two)
+            }
+
+            assert doSmething().left.left == 'a'
+            assert doSmething().left.right == 1
+            assert doSmething().right.left == 'b'
+            assert doSmething().right.right == 2
+        '''
+    }
+}


Mime
View raw message