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%2FECHRRulesetConstructor.java;h=dbba5a5390d93a99a5a010ea5baad5bc23bcb627;hp=25ae61345d77f5e7c085591d6a414699e58d1068;hb=e12e3ad357853a07b24923b341c4732962a94623;hpb=dcb08ba8db427e1e9951e61892c653c23977a8cc

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ECHRRulesetConstructor.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ECHRRulesetConstructor.java
index 25ae61345..dbba5a539 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ECHRRulesetConstructor.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ECHRRulesetConstructor.java
@@ -11,46 +11,31 @@ import org.simantics.scl.compiler.internal.codegen.references.IVal;
 import org.simantics.scl.compiler.internal.codegen.writer.CodeWriter;
 import org.simantics.scl.compiler.internal.interpreted.IExpression;
 import org.simantics.scl.compiler.top.ExpressionInterpretationContext;
-import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.exceptions.MatchException;
 
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
 public class ECHRRulesetConstructor extends Expression {
-    CHRRuleset ruleset;
+    public CHRRuleset ruleset;
     
     public ECHRRulesetConstructor(CHRRuleset ruleset) {
         this.ruleset = ruleset;
     }
-    
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs, TIntHashSet refs) {
-        ruleset.collectRefs(allRefs, refs);
-    }
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars, TIntHashSet vars) {
-        ruleset.collectVars(allVars, vars);
-    }
+
     @Override
     protected void updateType() throws MatchException {
         throw new InternalCompilerError("Type of ECHRRulesetConstructor should be already given.");
     }
+
     @Override
     public IVal toVal(CompilationContext context, CodeWriter w) {
         return ruleset.generateCode(w);
     }
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        ruleset.collectFreeVariables(vars);
-    }
+
     @Override
     public Expression resolve(TranslationContext context) {
         context.pushFrame();
         context.pushCHRConstraintFrame();
         ruleset.resolve(context);
-        context.popCHRConstraintFrame(ruleset.constraints);
+        context.popCHRConstraintFrame(ruleset);
         context.popFrame();
         return this;
     }
@@ -62,10 +47,6 @@ public class ECHRRulesetConstructor extends Expression {
         }
     }
     @Override
-    public void collectEffects(THashSet<Type> effects) {
-        ruleset.collectEffects(effects);
-    }
-    @Override
     public void accept(ExpressionVisitor visitor) {
         visitor.visit(this);
     }
@@ -78,8 +59,7 @@ public class ECHRRulesetConstructor extends Expression {
     
     @Override
     public Expression simplify(SimplificationContext context) {
-        ruleset.simplify(context);
-        ruleset.compile(context);
+        ruleset.simplifyAndCompileIfNeeded(context);
         return this;
     }