X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fchr%2Fplan%2FPostCommitOp.java;h=5902f958879e30613410c873a301ba3381aeed2b;hb=refs%2Fchanges%2F34%2F1534%2F3;hp=af41f932b69f08084b6818134493606e33bb7574;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PostCommitOp.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PostCommitOp.java
index af41f932b..5902f9588 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PostCommitOp.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PostCommitOp.java
@@ -3,6 +3,7 @@ package org.simantics.scl.compiler.elaboration.chr.plan;
 import org.simantics.scl.compiler.compilation.CompilationContext;
 import org.simantics.scl.compiler.constants.IntegerConstant;
 import org.simantics.scl.compiler.constants.singletons.NullCheck;
+import org.simantics.scl.compiler.elaboration.chr.CHRRuleset;
 import org.simantics.scl.compiler.elaboration.chr.relations.CHRConstraint;
 import org.simantics.scl.compiler.internal.codegen.continuations.ICont;
 import org.simantics.scl.compiler.internal.codegen.references.IVal;
@@ -24,30 +25,30 @@ public class PostCommitOp extends PlanOp {
     @Override
     public void generateCode(CompilationContext context, PlanContext planContext, CodeWriter w) {
         if(planContext.currentId != null) {
-            w.apply(location, planContext.ruleset.writeCurrentId, planContext.storeVar, planContext.currentId);
+            w.apply(location, CHRRuleset.WRITE_CURRENT_ID, planContext.contextVar, planContext.currentId);
             planContext.currentId = null;
-            w.apply(location, planContext.ruleset.activateProcedure, planContext.storeVar, new IntegerConstant(priority));
+            w.apply(location, CHRRuleset.ACTIVATE, planContext.contextVar, new IntegerConstant(priority+planContext.ruleset.initialPriorityNumber));
         }
         for(PartnerFact activeFact : planContext.partnerFacts) {
             if(activeFact.killAfterMatch) {
                 if(activeFact.nextFact == null)
-                    w.jump(activeFact.finishCont);
+                    w.jump(location, activeFact.finishCont);
                 else {
                     CodeWriter iterateAlive = w.createBlock(activeFact.constraint.factType);
-                    w.jump(iterateAlive.getContinuation(), w.apply(location, activeFact.nextFact, activeFact.factVar));
-                    iterateUntilLiveFactFound(iterateAlive, activeFact);                    
+                    w.jump(location, iterateAlive.getContinuation(), w.apply(location, activeFact.nextFact, activeFact.factVar));
+                    iterateUntilLiveFactFound(iterateAlive, activeFact);
                 }
                 break;
             }
             else if(activeFact.mayBeRemoved) {
                 if(activeFact.nextFact == null) {
-                    w.branchAwayUnless(activeFact.isAlive(location, w), activeFact.finishCont);
+                    w.branchAwayUnless(location, activeFact.isAlive(location, w), activeFact.finishCont);
                 }
                 else {
                     CodeWriter failure = w.createBlock();
                     CodeWriter iterateAlive = w.createBlock(activeFact.constraint.factType);
-                    w.branchAwayUnless(activeFact.isAlive(location, w), failure.getContinuation());
-                    failure.jump(iterateAlive.getContinuation(), failure.apply(location, activeFact.nextFact, activeFact.factVar));
+                    w.branchAwayUnless(location, activeFact.isAlive(location, w), failure.getContinuation());
+                    failure.jump(location, iterateAlive.getContinuation(), failure.apply(location, activeFact.nextFact, activeFact.factVar));
                     iterateUntilLiveFactFound(iterateAlive, activeFact);     
                 }
             }
@@ -60,10 +61,10 @@ public class PostCommitOp extends PlanOp {
         CHRConstraint constraint = activeFact.constraint;
         IVal fact = w.getParameters()[0];
         CodeWriter dead = w.createBlock();
-        w.branchAwayIf(w.apply(location, NullCheck.INSTANCE.createSpecialization(constraint.factType), fact), activeFact.finishCont);
-        w.branchAwayUnless(activeFact.isAlive(location, w, fact), dead.getContinuation());
-        w.jump(activeFact.continueCont, fact);
-        dead.jump(initialContinuation, dead.apply(location, activeFact.nextFact, fact));
+        w.branchAwayIf(location, w.apply(location, NullCheck.INSTANCE.createSpecialization(constraint.factType), fact), activeFact.finishCont);
+        w.branchAwayUnless(location, activeFact.isAlive(location, w, fact), dead.getContinuation());
+        w.jump(location, activeFact.continueCont, fact);
+        dead.jump(location, initialContinuation, dead.apply(location, activeFact.nextFact, fact));
     }
 
 }