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%2Felaboration%2Fexpressions%2FECHRSelect.java;h=bf3b818f56c01c844b078705751ca1f3d20fd873;hp=d1873e4e6f3240bcf07307e2ec17a54be940232a;hb=666ee533a3cfa9f59e79215a269f8342227cdbda;hpb=ff1337ff96700fb157ec789cbef88b8f40e03798

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ECHRSelect.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ECHRSelect.java
index d1873e4e6..bf3b818f5 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ECHRSelect.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ECHRSelect.java
@@ -21,14 +21,10 @@ import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.compiler.types.exceptions.MatchException;
 import org.simantics.scl.compiler.types.kinds.Kinds;
 
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
 public class ECHRSelect extends Expression {
-    CHRQuery query;
-    Variable[] existentialVariables;
-    Expression expression;
+    public CHRQuery query;
+    public Variable[] existentialVariables;
+    public Expression expression;
     private ArrayList<PlanOp> planOps;
     private CHRRuleset currentRuleset;
     
@@ -37,12 +33,6 @@ public class ECHRSelect extends Expression {
         this.query = query;
     }
 
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars, TIntHashSet vars) {
-        query.collectVars(allVars, vars);
-        expression.collectVars(allVars, vars);
-    }
-
     @Override
     protected void updateType() throws MatchException {
         setType(Types.list(expression.getType()));
@@ -84,15 +74,6 @@ public class ECHRSelect extends Expression {
         return w.apply(location, context.getValue(Names.MList_freeze).getValue(), list);
     }
 
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        query.collectFreeVariables(vars);
-        expression.collectFreeVariables(vars);
-        if(existentialVariables != null)
-            for(Variable variable : existentialVariables)
-                vars.remove(variable);
-    }
-
     @Override
     public Expression resolve(TranslationContext context) {
         currentRuleset = context.currentRuleset;