X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fchr%2FCHRRule.java;h=f714497c4212c76c1ccef6e217a06c40f2d71a39;hp=48aefbdac541459f783c7becb5d013bd488d6a9b;hb=f5c5f79bf2a62515c8c81103a4c8932fc0dcf79d;hpb=fc1c765795517b3e77a1956fb2ae98a770d2beec

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRule.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRule.java
index 48aefbdac..f714497c4 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRule.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRRule.java
@@ -1,8 +1,9 @@
 package org.simantics.scl.compiler.elaboration.chr;
 
+import java.util.ArrayList;
+
 import org.simantics.scl.compiler.compilation.CompilationContext;
-import org.simantics.scl.compiler.elaboration.chr.plan.PlanOp;
-import org.simantics.scl.compiler.elaboration.chr.plan.PrioritizedPlan;
+import org.simantics.scl.compiler.elaboration.chr.plan.CHRSearchPlan;
 import org.simantics.scl.compiler.elaboration.chr.planning.QueryPlanningContext;
 import org.simantics.scl.compiler.elaboration.chr.relations.CHRConstraint;
 import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;
@@ -22,15 +23,22 @@ import gnu.trove.set.hash.THashSet;
 import gnu.trove.set.hash.TIntHashSet;
 
 public class CHRRule extends Symbol {
+    public CHRRuleset parentRuleset;
     public int priority;
     public CHRQuery head;
     public CHRQuery body;
     public Variable[] existentialVariables;
     
     // Analysis
-    public int firstPriorityExecuted;
+    //public int firstPriorityExecuted;
     public int lastPriorityExecuted;
     
+    // Plans
+    public ArrayList<CHRSearchPlan> plans = new ArrayList<CHRSearchPlan>();
+    
+    // Code generation, move to CHRPriority
+    public String containerClassName;
+    
     public CHRRule(long location, CHRQuery head, CHRQuery body, Variable[] existentialVariables) {
         this.location = location;
         this.head = head;
@@ -41,6 +49,7 @@ public class CHRRule extends Symbol {
     public void resolve(TranslationContext context) {
         context.pushExistentialFrame();
         head.resolve(context);
+        context.disallowNewExistentials();
         body.resolve(context);
         existentialVariables = context.popExistentialFrame();
     }
@@ -86,7 +95,7 @@ public class CHRRule extends Symbol {
     }
 
     public void compile(CompilationContext compilationContext, CHRConstraint initConstraint) {
-        boolean hasActiveLiteral = false;
+        boolean hasLocalActiveLiteral = false;
         for(int i=0;i<head.literals.length;++i) {
             CHRLiteral literal = head.literals[i];
             if(literal.passive)
@@ -95,26 +104,31 @@ public class CHRRule extends Symbol {
             
             Variable activeFact = new Variable("activeFact", constraint.factType);
             QueryPlanningContext context = new QueryPlanningContext(compilationContext, existentialVariables);
-            if(!head.createQueryPlan(context, new EVariable(activeFact), i))
+            if(!head.createQueryPlan(context, new EVariable(activeFact), i, initConstraint))
                 return;
             body.createEnforcePlan(context, priority);
-            constraint.plans.add(new PrioritizedPlan(priority, activeFact, context.getPlanOps()));
+            addPlan(new CHRSearchPlan(constraint, activeFact, context.getPlanOps()));
             
-            hasActiveLiteral = true;
+            if(constraint.parentRuleset == parentRuleset)
+                hasLocalActiveLiteral = true;
         }
-        if(!hasActiveLiteral) {
+        if(!hasLocalActiveLiteral) {
             Variable activeFact = new Variable("activeFact", initConstraint.factType);
             QueryPlanningContext context = new QueryPlanningContext(compilationContext, existentialVariables);
-            if(!head.createQueryPlan(context, null, -1))
+            if(!head.createQueryPlan(context, new EVariable(activeFact), -1, initConstraint))
                 return;
             body.createEnforcePlan(context, priority);
             /*System.out.println(this);
             for(PlanOp planOp : context.getPlanOps())
                 System.out.println("    " + planOp);*/
-            initConstraint.plans.add(new PrioritizedPlan(priority, activeFact, context.getPlanOps()));
+            addPlan(new CHRSearchPlan(initConstraint, activeFact, context.getPlanOps()));
         }
     }
     
+    private void addPlan(CHRSearchPlan plan) {
+        plans.add(plan);
+    }
+
     public String toString() {
         StringBuilder b = new StringBuilder();
         ExpressionToStringVisitor visitor = new ExpressionToStringVisitor(b);