(refs #7250) Refactoring CHR implementation

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / elaboration / chr / CHRRulesetObject.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRulesetObject.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRulesetObject.java
index 73ba8ea1a1c4e5fc21822a15ded514e380d31785..a15e30e42638d6674a542478de4e3e8cd9aeaebb 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRulesetObject.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRulesetObject.java
@@ -2,7 +2,7 @@ package org.simantics.scl.compiler.elaboration.chr;
 
 import org.simantics.scl.compiler.constants.Constant;
 import org.simantics.scl.compiler.constants.JavaConstructor;
-import org.simantics.scl.compiler.internal.codegen.chr.CHRCodeGenerator;
+import org.simantics.scl.compiler.internal.codegen.chr.CHRRuntimeRulesetCodeGenerator;
 import org.simantics.scl.compiler.internal.codegen.references.BoundVar;
 import org.simantics.scl.compiler.internal.codegen.ssa.SSAObject;
 import org.simantics.scl.compiler.internal.codegen.utils.ModuleBuilder;
@@ -12,7 +12,7 @@ public class CHRRulesetObject extends SSAObject {
     CHRRuleset ruleset;
 
     public CHRRulesetObject(BoundVar target, CHRRuleset ruleset) {
-        super(ruleset.storeType);
+        super(ruleset.runtimeRulesetType);
         this.setTarget(target);
         this.ruleset = ruleset;
     }
@@ -21,11 +21,11 @@ public class CHRRulesetObject extends SSAObject {
     public Constant liftClosure(BoundVar newTarget, BoundVar[] parameters) {
         ruleset.this_ = newTarget;
         ruleset.parameters = parameters;
-        return new JavaConstructor(ruleset.storeClassName, Types.PROC, ruleset.storeType, Types.getTypes(parameters));
+        return new JavaConstructor(ruleset.runtimeRulesetName, Types.PROC, ruleset.runtimeRulesetType, Types.getTypes(parameters));
     }
     
     @Override
     public void generateCode(ModuleBuilder moduleBuilder) {
-        CHRCodeGenerator.generateStore(moduleBuilder, ruleset);
+        CHRRuntimeRulesetCodeGenerator.generateRuntimeRuleset(moduleBuilder, ruleset);
     }
 }