(refs #7250) Merging master, minor CHR bugfixes

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

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PlanRealizer.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PlanRealizer.java
index 8433c434be347389dab19ece70472d6c780c8545..43fedf765aecb0d2581a0af5bf5f7e021cca0691 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PlanRealizer.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/plan/PlanRealizer.java
@@ -1,26 +1,26 @@
-package org.simantics.scl.compiler.elaboration.chr.plan;\r
-\r
-import java.util.List;\r
-\r
-import org.simantics.scl.compiler.compilation.CompilationContext;\r
-import org.simantics.scl.compiler.elaboration.chr.CHRRuleset;\r
-import org.simantics.scl.compiler.internal.codegen.references.IVal;\r
-import org.simantics.scl.compiler.internal.codegen.writer.CodeWriter;\r
-\r
-public class PlanRealizer extends PlanContext {\r
-    List<PlanOp> ops;\r
-    int id = 0;\r
-\r
-    public PlanRealizer(CompilationContext context, CHRRuleset ruleset, IVal storeVar, List<PlanOp> ops) {\r
-        super(context, ruleset, storeVar);\r
-        this.ops = ops;\r
-    }\r
-\r
-    @Override\r
-    public void nextOp(CodeWriter w) {\r
-        PlanOp planOp = ops.get(id);\r
-        ++id;\r
-        planOp.generateCode(context, this, w);\r
-    }\r
-    \r
-}\r
+package org.simantics.scl.compiler.elaboration.chr.plan;
+
+import java.util.List;
+
+import org.simantics.scl.compiler.compilation.CompilationContext;
+import org.simantics.scl.compiler.elaboration.chr.CHRRuleset;
+import org.simantics.scl.compiler.internal.codegen.references.IVal;
+import org.simantics.scl.compiler.internal.codegen.writer.CodeWriter;
+
+public class PlanRealizer extends PlanContext {
+    List<PlanOp> ops;
+    int id = 0;
+
+    public PlanRealizer(CompilationContext context, CHRRuleset ruleset, IVal storeVar, IVal contextVar, List<PlanOp> ops) {
+        super(context, ruleset, storeVar, contextVar);
+        this.ops = ops;
+    }
+
+    @Override
+    public void nextOp(CodeWriter w) {
+        PlanOp planOp = ops.get(id);
+        ++id;
+        planOp.generateCode(context, this, w);
+    }
+    
+}