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%2FAccessFactOp.java;h=c0cb00184770119175520905e9a3837b0b1873b6;hb=refs%2Fchanges%2F34%2F1534%2F3;hp=3ebbb03cf51bf78d5a52676683d6110ba109f8d1;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/AccessFactOp.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/AccessFactOp.java
index 3ebbb03cf..c0cb00184 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/AccessFactOp.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/AccessFactOp.java
@@ -37,15 +37,14 @@ public class AccessFactOp extends PlanOp {
 
     @Override
     public void generateCode(CompilationContext context, PlanContext planContext, CodeWriter w) {
-        IVal inputVal = inputFact.toVal(context.environment, w);
+        IVal inputVal = inputFact.toVal(context, w);
         for(int i=0;i<variables.length;++i)
-            variables[i].setVal(w.apply(location, constraint.accessComponent(i), inputVal));
+            variables[i].setVal(constraint.accessComponent(location, w, inputVal, i));
         IVal activeId = w.apply(location, constraint.accessId, inputVal);
         CodeWriter end = constraint.mayBeRemoved() ? w.createBlock() : null;
         planContext.partnerFacts.add(new PartnerFact(true, activeId, constraint, inputVal, constraint.mayBeRemoved(), killAfterMatch, null, null, end == null ? null : end.getContinuation()));
         planContext.nextOp(w);
         if(end != null)
-            end.return_(BooleanConstant.FALSE);
+            end.return_(location, BooleanConstant.FALSE);
     }
-
 }