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=dd91efb70feff2aba4eea80f9264f6a5365f2429;hb=a8758de5bc19e5adb3f618d3038743a164f09912;hpb=3303fe4a3b363e88662ac75a4f7e873ddb3ab352 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 dd91efb70..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 @@ -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);