X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Fconstants%2Fgeneric%2FCallJava.java;h=b5ba945797afcd350d1ca6ad2998c7515c2a8045;hb=refs%2Fchanges%2F63%2F1863%2F1;hp=1dd4477151e0a255dd21c0f7884dbb47d6a5c686;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/constants/generic/CallJava.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/constants/generic/CallJava.java
index 1dd447715..b5ba94579 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/constants/generic/CallJava.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/constants/generic/CallJava.java
@@ -1,9 +1,13 @@
 package org.simantics.scl.compiler.constants.generic;
 
 import org.cojen.classfile.TypeDesc;
+import org.objectweb.asm.Label;
 import org.simantics.scl.compiler.constants.FunctionValue;
+import org.simantics.scl.compiler.internal.codegen.continuations.Cont;
+import org.simantics.scl.compiler.internal.codegen.references.IVal;
 import org.simantics.scl.compiler.internal.codegen.references.Val;
 import org.simantics.scl.compiler.internal.codegen.types.JavaReferenceValidator;
+import org.simantics.scl.compiler.internal.codegen.utils.Constants;
 import org.simantics.scl.compiler.internal.codegen.utils.MethodBuilder;
 import org.simantics.scl.compiler.types.TVar;
 import org.simantics.scl.compiler.types.Type;
@@ -58,8 +62,12 @@ public class CallJava extends FunctionValue {
         MethodRef m2 = other.methodRef;
         TypeDesc[] ps1 = m1.getParameterTypes();
         TypeDesc[] ps2 = m2.getParameterTypes();
-        if(ps1.length != ps2.length)
-            return INCOMPARABLE;
+        if(ps1.length != ps2.length) {
+            if(ps1.length < ps2.length)
+                return LESS;
+            else
+                return GREATER;
+        }
 
         boolean lessOrEqual = true;
         boolean greaterOrEqual = true;
@@ -92,4 +100,16 @@ public class CallJava extends FunctionValue {
         for(StackItem item : stackItems)
             item.prepare(mb);
     }
+    
+    @Override
+    public void deconstruct(MethodBuilder mb, IVal parameter, Cont success,
+            Label failure) {
+        if(parameterTypes.length != 0)
+            super.deconstruct(mb, parameter, success, failure);
+        push(mb);
+        mb.push(parameter, getType());
+        mb.invokeVirtual(TypeDesc.OBJECT, "equals", TypeDesc.BOOLEAN, Constants.OBJECTS[1]);
+        mb.ifZeroComparisonBranch(failure, "==");
+        mb.jump(success);
+    }
 }