Merged changes from feature/scl to master.

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / internal / elaboration / constraints / ConstraintSolver.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/constraints/ConstraintSolver.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/constraints/ConstraintSolver.java
index dfff76475135ab9ec1fc5b694421c25de5e32122..35f916ec0ed6290ee0c06ad1c97d96f95414efb6 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/constraints/ConstraintSolver.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/constraints/ConstraintSolver.java
@@ -1,8 +1,5 @@
 package org.simantics.scl.compiler.internal.elaboration.constraints;\r
 \r
-import gnu.trove.map.hash.THashMap;\r
-import gnu.trove.set.hash.THashSet;\r
-\r
 import java.util.ArrayList;\r
 import java.util.Arrays;\r
 import java.util.Collections;\r
@@ -20,6 +17,9 @@ import org.simantics.scl.compiler.types.exceptions.UnificationException;
 import org.simantics.scl.compiler.types.util.TConComparator;\r
 import org.simantics.scl.compiler.types.util.TypeUnparsingContext;\r
 \r
+import gnu.trove.map.hash.THashMap;\r
+import gnu.trove.set.hash.THashSet;\r
+\r
 public class ConstraintSolver {\r
 \r
     public static THashSet<TCon> DEFAULTS_IGNORE = new THashSet<TCon>(); \r
@@ -29,7 +29,6 @@ public class ConstraintSolver {
         DEFAULTS_IGNORE.add(Types.SHOW);\r
         DEFAULTS_IGNORE.add(Types.con("Json2", "JSON"));\r
         DEFAULTS_IGNORE.add(Types.VEC_COMP);\r
-        DEFAULTS_IGNORE.add(Types.EQ);\r
         DEFAULTS_IGNORE.add(Types.ORD);\r
         DEFAULTS_IGNORE.add(Types.TYPEABLE);\r
         DEFAULTS_IGNORE.add(Types.SERIALIZABLE);\r
@@ -155,7 +154,7 @@ public class ConstraintSolver {
                         }\r
                         for(Constraint constraint : group) {\r
                             Reduction reduction = environment.reduce(constraint.constraint);\r
-                            if(reduction.parameters.length > 0)\r
+                            if(reduction.demands.length > 0)\r
                                 throw new InternalCompilerError();\r
                             constraint.setGenerator(Constraint.STATE_HAS_INSTANCE,\r
                                     reduction.generator, reduction.parameters);\r