X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Finternal%2Felaboration%2Fconstraints%2FConstraintSolver.java;h=35f916ec0ed6290ee0c06ad1c97d96f95414efb6;hp=dfff76475135ab9ec1fc5b694421c25de5e32122;hb=3448b94a8e90047c88eb62a0542c1596acb701b8;hpb=969bd23cab98a79ca9101af33334000879fb60c5

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 dfff76475..35f916ec0 100644
--- 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;
 
-import gnu.trove.map.hash.THashMap;
-import gnu.trove.set.hash.THashSet;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -20,6 +17,9 @@ import org.simantics.scl.compiler.types.exceptions.UnificationException;
 import org.simantics.scl.compiler.types.util.TConComparator;
 import org.simantics.scl.compiler.types.util.TypeUnparsingContext;
 
+import gnu.trove.map.hash.THashMap;
+import gnu.trove.set.hash.THashSet;
+
 public class ConstraintSolver {
 
     public static THashSet<TCon> DEFAULTS_IGNORE = new THashSet<TCon>(); 
@@ -29,7 +29,6 @@ public class ConstraintSolver {
         DEFAULTS_IGNORE.add(Types.SHOW);
         DEFAULTS_IGNORE.add(Types.con("Json2", "JSON"));
         DEFAULTS_IGNORE.add(Types.VEC_COMP);
-        DEFAULTS_IGNORE.add(Types.EQ);
         DEFAULTS_IGNORE.add(Types.ORD);
         DEFAULTS_IGNORE.add(Types.TYPEABLE);
         DEFAULTS_IGNORE.add(Types.SERIALIZABLE);
@@ -155,7 +154,7 @@ public class ConstraintSolver {
                         }
                         for(Constraint constraint : group) {
                             Reduction reduction = environment.reduce(constraint.constraint);
-                            if(reduction.parameters.length > 0)
+                            if(reduction.demands.length > 0)
                                 throw new InternalCompilerError();
                             constraint.setGenerator(Constraint.STATE_HAS_INSTANCE,
                                     reduction.generator, reduction.parameters);