Merged changes from feature/scl to master.

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / elaboration / java / OptionalRelation.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/OptionalRelation.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/OptionalRelation.java
index 3276e0f2213e5d0d52415c48bda698b9ea381890..ef30deb435ca36318350ccfb8c5fdceb06577f60 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/OptionalRelation.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/java/OptionalRelation.java
@@ -1,6 +1,6 @@
 package org.simantics.scl.compiler.elaboration.java;
 
-import org.simantics.scl.compiler.common.names.Name;
+import org.simantics.scl.compiler.common.names.Names;
 import org.simantics.scl.compiler.elaboration.expressions.EApply;
 import org.simantics.scl.compiler.elaboration.expressions.EVariable;
 import org.simantics.scl.compiler.elaboration.expressions.Expression;
@@ -65,9 +65,8 @@ public class OptionalRelation extends AbstractRelation {
         case BB: 
             context.condition(
                     new EApply(
-                            context.getConstant(Name.create("Prelude", "elemMaybe"), typeParameters),
+                            context.getConstant(Names.Prelude_elemMaybe, typeParameters),
                             new Expression[] {
-                                context.getEvidence(location, Types.pred(Types.EQ, typeParameters[0])),
                                 new EVariable(parameters[0]),
                                 new EVariable(parameters[1])
                             }