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=0ed3f8975d9bbaae4964d8f184453fdaa744b658;hb=refs%2Fchanges%2F79%2F579%2F2;hp=aea2cbfdcd47b0921222e4ccde6a50fd0c34db1c;hpb=bf540e621923947f9d6f4d5eeef5d05f08373125;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..0ed3f8975 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;
@@ -25,20 +23,22 @@ public abstract class PlanContext {
     public CompilationContext context;
     public CHRRuleset ruleset;
     public IVal storeVar;
+    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 storeVar, IVal contextVar) {
         this.context = context;
         this.ruleset = ruleset;
         this.storeVar = storeVar;
+        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, ruleset.readCurrentId, contextVar);
         IVal result = currentId;
         currentId = w.apply(location, IncreaseByOne.INSTANCE, currentId);
         return result;