minor edits

groovy · Mar 8, 2022 · c6ef59c · c6ef59c
1 parent ef6a80a
commit c6ef59c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 28 deletions.
diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/control/ResolveVisitor.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/control/ResolveVisitor.java
@@ -1520,9 +1520,7 @@ protected void finishedResolution() {
     // GRECLIPSE end
 
     private void addFatalError(final String text, final ASTNode node) {
-        source.getErrorCollector().addFatalError(
-                org.codehaus.groovy.control.messages.Message.create(new SyntaxException(text, node), source)
-        );
+        source.addFatalError(text, node);
     }
 
     private void checkCyclicInheritance(final ClassNode node, final ClassNode type) {

diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/control/SourceUnit.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/control/SourceUnit.java
@@ -345,21 +345,11 @@ public void addError(SyntaxException se) throws CompilationFailedException {
      * @param msg the error message
      * @param node the AST node
      * @throws CompilationFailedException on error
+     *
      * @since 3.0.0
      */
     public void addFatalError(String msg, ASTNode node) throws CompilationFailedException {
-        getErrorCollector().addFatalError(
-                new SyntaxErrorMessage(
-                        new SyntaxException(
-                                msg,
-                                node.getLineNumber(),
-                                node.getColumnNumber(),
-                                node.getLastLineNumber(),
-                                node.getLastColumnNumber()
-                        ),
-                        this
-                )
-        );
+        getErrorCollector().addFatalError(Message.create(new SyntaxException(msg, node), this));
     }
 
     public void addErrorAndContinue(SyntaxException se) {

diff --git a/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -100,6 +100,7 @@
 import static org.codehaus.groovy.ast.ClassHelper.double_TYPE;
 import static org.codehaus.groovy.ast.ClassHelper.findSAM;
 import static org.codehaus.groovy.ast.ClassHelper.float_TYPE;
+import static org.codehaus.groovy.ast.ClassHelper.getNextSuperClass;
 import static org.codehaus.groovy.ast.ClassHelper.getUnwrapper;
 import static org.codehaus.groovy.ast.ClassHelper.getWrapper;
 import static org.codehaus.groovy.ast.ClassHelper.int_TYPE;
@@ -120,7 +121,6 @@
 import static org.codehaus.groovy.ast.ClassHelper.makeWithoutCaching;
 import static org.codehaus.groovy.ast.ClassHelper.short_TYPE;
 import static org.codehaus.groovy.ast.ClassHelper.void_WRAPPER_TYPE;
-import static org.codehaus.groovy.ast.tools.GenericsUtils.makeClassSafe0;
 import static org.codehaus.groovy.ast.tools.WideningCategories.isBigIntCategory;
 import static org.codehaus.groovy.ast.tools.WideningCategories.isFloatingCategory;
 import static org.codehaus.groovy.ast.tools.WideningCategories.isNumberCategory;
@@ -1460,7 +1460,7 @@ private static boolean typeCheckMethodsWithGenerics(final ClassNode receiver, fi
                     // GROOVY-8034: non-static method may use class generics
                     gts = applyGenericsContext(candidateGenerics, gts);
                 }
-                GenericsUtils.extractPlaceholders(makeClassSafe0(OBJECT_TYPE, gts), candidateGenerics);
+                GenericsUtils.extractPlaceholders(GenericsUtils.makeClassSafe0(OBJECT_TYPE, gts), candidateGenerics);
 
                 // the outside context parts till now define placeholder we are not allowed to
                 // generalize, thus we save that for later use...
@@ -1740,12 +1740,11 @@ static void extractGenericsConnections(final Map<GenericsTypeName, GenericsType>
             ClassNode returnType = StaticTypeCheckingVisitor.wrapTypeIfNecessary(GenericsUtils.parameterizeSAM(target).getV2());
             extractGenericsConnections(connections, type.getGenericsTypes(), new GenericsType[] {returnType.asGenericsType()});
 
-        } else if (type.equals(target) || !implementsInterfaceOrIsSubclassOf(type, target)) {
+        } else if (type.equals(target)) {
             extractGenericsConnections(connections, type.getGenericsTypes(), target.getGenericsTypes());
 
-        } else {
-            // find matching super class or interface
-            ClassNode superClass = GenericsUtils.getSuperClass(type, target);
+        } else if (implementsInterfaceOrIsSubclassOf(type, target)) {
+            ClassNode superClass = getNextSuperClass(type, target);
             if (superClass != null) {
                 if (GenericsUtils.hasUnresolvedGenerics(superClass)) {
                     Map<String, ClassNode> spec = GenericsUtils.createGenericsSpec(type);
@@ -1928,8 +1927,8 @@ static ClassNode getCombinedBoundType(final GenericsType genericsType) {
     }
 
     static GenericsType getCombinedGenericsType(final GenericsType gt1, final GenericsType gt2) {
-        ClassNode cn1 = makeClassSafe0(CLASS_Type, gt1);
-        ClassNode cn2 = makeClassSafe0(CLASS_Type, gt2);
+        ClassNode cn1 = GenericsUtils.makeClassSafe0(CLASS_Type, gt1);
+        ClassNode cn2 = GenericsUtils.makeClassSafe0(CLASS_Type, gt2);
         ClassNode lub = lowestUpperBound(cn1,cn2);
         return lub.getGenericsTypes()[0];
     }

diff --git a/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java b/...rg.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -877,7 +877,10 @@ && isAssignment(enclosingBinaryExpression.getOperation().getType())) {
                     } else if (!resultType.isGenericsPlaceHolder()) { // GROOVY-10324
                         Map<GenericsTypeName, GenericsType> gt = new HashMap<>();
                         extractGenericsConnections(gt, resultType, resultType.redirect());
-                        extractGenericsConnections(gt, lType, getNextSuperClass(resultType, lType));
+                        ClassNode sc = resultType;
+                        do { sc = getNextSuperClass(sc, lType);
+                        } while (sc != null && !sc.equals(lType));
+                        extractGenericsConnections(gt, lType, sc);
 
                         resultType = applyGenericsContext(gt, resultType.redirect());// GROOVY-10235, et al.
                     }
@@ -3124,7 +3127,6 @@ private void doInferClosureParameterTypes(final ClassNode receiver, final Expres
             } else {
                 for (int i = 0, n = closureParams.length; i < n; i += 1) {
                     Parameter closureParam = closureParams[i];
-                    ClassNode declaredType = closureParam.getOriginType();
                     ClassNode inferredType = OBJECT_TYPE;
                     if (i < inferred.length - 1 || inferred.length == n) {
                         inferredType = inferred[i];

diff --git a/extras/groovy-eclipse-batch-builder/build.properties b/extras/groovy-eclipse-batch-builder/build.properties
@@ -1,5 +1,5 @@
 # version numbers
-version2.5=2.5.16-02
+version2.5=2.5.16-01
 version3.0=3.0.10-02
 version4.0=4.0.1-02
 
@@ -9,10 +9,10 @@ version4.0=4.0.1-02
 do-40-build=true
 
 # location of the plugins directory for the eclipse install
-eclipse.install.plugins=C:/Users/Public/Eclipse-4.22/plugins
+eclipse.install.plugins=C:/Users/Public/Eclipse-4.23/plugins
 
 # location of the cloned groovy-eclipse git repository
 git.repo.loc=C:/Users/Name/workspace/groovy-eclipse
 
 # which JDT Core patch is active in your workspace?
-jdt.patch.target=e422
+jdt.patch.target=e423