Fix for #1209: use name of method target for call expression

Author: eric-milles

base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/sc/transformers/BinaryExpressionTransformer.java

@@ -281,7 +281,11 @@ public Expression transform(final Expression expression) {
             MethodNode adapter = StaticCompilationTransformer.BYTECODE_BINARY_ADAPTERS.get(operationType);
             if (adapter != null) {
                 ClassExpression sba = new ClassExpression(StaticCompilationTransformer.BYTECODE_ADAPTER_CLASS);
+                /* GRECLIPSE edit
                 call = new MethodCallExpression(sba, "compareEquals", new ArgumentListExpression(expr, right));
+                */
+                call = new MethodCallExpression(sba, adapter.getName(), new ArgumentListExpression(expr, right));
+                // GRECLIPSE end
                 call.setMethodTarget(adapter);
             } else {
                 call = new MethodCallExpression(expr, name, new ArgumentListExpression(right));

base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/sc/transformers/BinaryExpressionTransformer.java

@@ -150,8 +150,8 @@ public Expression transformBinaryExpression(final BinaryExpression bin) {
             Expression right = staticCompilationTransformer.transform(rightExpression);
 
             if (operationType == Types.COMPARE_TO
-                    && findType(leftExpression).implementsInterface(ClassHelper.COMPARABLE_TYPE)
-                    && findType(rightExpression).implementsInterface(ClassHelper.COMPARABLE_TYPE)) {
+                    && findType(left/*Expression*/).implementsInterface(ClassHelper.COMPARABLE_TYPE)
+                    && findType(right/*Expression*/).implementsInterface(ClassHelper.COMPARABLE_TYPE)) {
                 call = callX(left, "compareTo", args(right));
                 call.setImplicitThis(false);
                 call.setMethodTarget(COMPARE_TO_METHOD);
@@ -240,7 +240,11 @@ public Expression transform(final Expression expression) {
             MethodNode adapter = StaticCompilationTransformer.BYTECODE_BINARY_ADAPTERS.get(operationType);
             if (adapter != null) {
                 Expression sba = classX(StaticCompilationTransformer.BYTECODE_ADAPTER_CLASS);
+                /* GRECLIPSE edit
                 call = callX(sba, "compareEquals", args(expr, right));
+                */
+                call = callX(sba, adapter.getName(), args(expr, right));
+                // GRECLIPSE end
                 call.setMethodTarget(adapter);
             } else {
                 call = callX(expr, name, args(right));