Fixed leftover problems in unification of *Array and Vector types

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

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/constraints/ConstraintSet.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/constraints/ConstraintSet.java
index 1473ab9c465335738f584242e47b6e7f5d137a30..a18eae11f3c2899738daf325c6884eed511a274f 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/constraints/ConstraintSet.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/constraints/ConstraintSet.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 org.simantics.scl.compiler.elaboration.expressions.ELiteral;
@@ -13,6 +10,9 @@ import org.simantics.scl.compiler.types.TCon;
 import org.simantics.scl.compiler.types.TPred;
 import org.simantics.scl.compiler.types.Types;
 
+import gnu.trove.map.hash.THashMap;
+import gnu.trove.set.hash.THashSet;
+
 class ConstraintSet {
     
     private static int id = 0;
@@ -100,7 +100,7 @@ class ConstraintSet {
             unsolved = new THashSet<Constraint>();
             for(Constraint c : temp) {
                 if(c.state == Constraint.STATE_UNSOLVED) {
-                    Reduction reduction = environment.reduce(c.constraint);
+                    Reduction reduction = environment.reduce(c.demandLocation, c.constraint);
                     if(reduction != null) {
                         TPred[] demands = reduction.demands;
                         if(demands.length == 0)