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%2FPlanContext.java;h=62bcfc9581fd9650c4d869c4c0a7b759e423de2a;hb=refs%2Fchanges%2F34%2F1534%2F3;hp=aea2cbfdcd47b0921222e4ccde6a50fd0c34db1c;hpb=b2c6aed4003ef264fb48eed9ac9f2d0f6c2d5b13;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PlanContext.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PlanContext.java
index aea2cbfdc..62bcfc958 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PlanContext.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PlanContext.java
@@ -2,8 +2,6 @@ package org.simantics.scl.compiler.elaboration.chr.plan;
 
 import java.util.ArrayList;
 
-import javax.crypto.CipherInputStream;
-
 import org.simantics.scl.compiler.compilation.CompilationContext;
 import org.simantics.scl.compiler.constants.IntegerConstant;
 import org.simantics.scl.compiler.constants.JavaComparisonOperation;
@@ -12,7 +10,9 @@ import org.simantics.scl.compiler.constants.singletons.JustConstant;
 import org.simantics.scl.compiler.constants.singletons.ListElement;
 import org.simantics.scl.compiler.constants.singletons.ListLength;
 import org.simantics.scl.compiler.elaboration.chr.CHRRuleset;
+import org.simantics.scl.compiler.elaboration.chr.relations.CHRConstraint;
 import org.simantics.scl.compiler.elaboration.expressions.Variable;
+import org.simantics.scl.compiler.elaboration.expressions.block.IncludeStatement;
 import org.simantics.scl.compiler.elaboration.java.EqualsFunction;
 import org.simantics.scl.compiler.internal.codegen.continuations.Branch;
 import org.simantics.scl.compiler.internal.codegen.continuations.ICont;
@@ -24,21 +24,23 @@ import org.simantics.scl.compiler.types.Types;
 public abstract class PlanContext {
     public CompilationContext context;
     public CHRRuleset ruleset;
-    public IVal storeVar;
+    public IVal mainStoreVar;
+    public IVal contextVar;
     public ArrayList<PartnerFact> partnerFacts = new ArrayList<PartnerFact>();
     public IVal currentId;
     
-    public PlanContext(CompilationContext context, CHRRuleset ruleset, IVal storeVar) {
+    public PlanContext(CompilationContext context, CHRRuleset ruleset, IVal mainStoreVar, IVal contextVar) {
         this.context = context;
         this.ruleset = ruleset;
-        this.storeVar = storeVar;
+        this.mainStoreVar = mainStoreVar;
+        this.contextVar = contextVar;
     }
 
     public abstract void nextOp(CodeWriter w);
 
     public IVal generateNewId(long location, CodeWriter w) {
         if(currentId == null)
-            currentId = w.apply(location, ruleset.readCurrentId, storeVar);
+            currentId = w.apply(location, CHRRuleset.READ_CURRENT_ID, contextVar);
         IVal result = currentId;
         currentId = w.apply(location, IncreaseByOne.INSTANCE, currentId);
         return result;
@@ -52,15 +54,15 @@ public abstract class PlanContext {
         ICont bodyContinuation = body.getContinuation();
         CodeWriter end = w.createBlock();
                 
-        w.jump(body.getContinuation(), IntegerConstant.ZERO);
+        w.jump(location, body.getContinuation(), IntegerConstant.ZERO);
         
         IVal index = body.getParameters()[0];
-        body.branchAwayIf(body.apply(location, JavaComparisonOperation.IEQUAL, index, listLength),
+        body.branchAwayIf(location, body.apply(location, JavaComparisonOperation.IEQUAL, index, listLength),
                 end.getContinuation());
         variable.setVal(body.apply(location, ListElement.INSTANCE.createSpecialization(componentType), listValue, index));
         nextOp(body);
         if(body.isUnfinished())
-            body.jump(bodyContinuation, body.apply(location, IncreaseByOne.INSTANCE, index));
+            body.jump(location, bodyContinuation, body.apply(location, IncreaseByOne.INSTANCE, index));
         
         w.continueAs(end);
     }
@@ -70,7 +72,7 @@ public abstract class PlanContext {
 
         CodeWriter end = w.createBlock();
         CodeWriter body = w.createBlock(componentType);
-        w.switch_(maybeValue, new Branch[] {
+        w.switch_(location, maybeValue, new Branch[] {
                 new Branch(JustConstant.INSTANCE, body.getContinuation()),
                 new Branch(null, end.getContinuation())
         });
@@ -78,17 +80,17 @@ public abstract class PlanContext {
         variable.setVal(body.getParameters()[0]);
         nextOp(body);
         if(body.isUnfinished())
-            body.jump(end.getContinuation());
+            body.jump(location, end.getContinuation());
         
         w.continueAs(end);
     }
 
     public void check(long location, CodeWriter w, IVal booleanValue) {
         CodeWriter end = w.createBlock();
-        w.branchAwayUnless(booleanValue, end.getContinuation());
+        w.branchAwayUnless(location, booleanValue, end.getContinuation());
         nextOp(w);
         if(w.isUnfinished())
-            w.jump(end.getContinuation());
+            w.jump(location, end.getContinuation());
         w.continueAs(end);
     }
 
@@ -103,17 +105,25 @@ public abstract class PlanContext {
 
         CodeWriter end = w.createBlock();
         CodeWriter body = w.createBlock(componentType);
-        w.switch_(maybeValue, new Branch[] {
+        w.switch_(location, maybeValue, new Branch[] {
                 new Branch(JustConstant.INSTANCE, body.getContinuation()),
                 new Branch(null, end.getContinuation())
         });
-        body.branchAwayUnless(body.apply(location,
+        body.branchAwayUnless(location, body.apply(location,
                 EqualsFunction.INSTANCE.createSpecialization(componentType),
                 value, body.getParameters()[0]), end.getContinuation());
         nextOp(body);
         if(body.isUnfinished())
-            body.jump(end.getContinuation());
+            body.jump(location, end.getContinuation());
         
         w.continueAs(end);
     }
+
+    public IVal getStoreVar(CHRConstraint constraint) {
+        IncludeStatement includeStatement = ruleset.constraintSourceMap.get(constraint);
+        if(includeStatement != null)
+            return includeStatement.storeVar;
+        else
+            return mainStoreVar;
+    }
 }