(refs #7365) Fixed the bug in the test CHR11.scl

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

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 9846ebd4807db5342ace21ceec9027b41ba4c5f5..f714497c4212c76c1ccef6e217a06c40f2d71a39 100644 (file)
--- 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
@@ -23,13 +23,14 @@ import gnu.trove.set.hash.THashSet;
 import gnu.trove.set.hash.TIntHashSet;
 
 public class CHRRule extends Symbol {
 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 priority;
     public CHRQuery head;
     public CHRQuery body;
     public Variable[] existentialVariables;
     
     // Analysis

-    public int firstPriorityExecuted;
+    //public int firstPriorityExecuted;

     public int lastPriorityExecuted;
     
     // Plans
     public int lastPriorityExecuted;
     
     // Plans


@@ -48,6 +49,7 @@ public class CHRRule extends Symbol {
     public void resolve(TranslationContext context) {
         context.pushExistentialFrame();
         head.resolve(context);
     public void resolve(TranslationContext context) {
         context.pushExistentialFrame();
         head.resolve(context);

+        context.disallowNewExistentials();

         body.resolve(context);
         existentialVariables = context.popExistentialFrame();
     }
         body.resolve(context);
         existentialVariables = context.popExistentialFrame();
     }


@@ -93,7 +95,7 @@ public class CHRRule extends Symbol {
     }
 
     public void compile(CompilationContext compilationContext, CHRConstraint initConstraint) {
     }
 
     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)
         for(int i=0;i<head.literals.length;++i) {
             CHRLiteral literal = head.literals[i];
             if(literal.passive)


@@ -102,17 +104,18 @@ public class CHRRule extends Symbol {
             
             Variable activeFact = new Variable("activeFact", constraint.factType);
             QueryPlanningContext context = new QueryPlanningContext(compilationContext, existentialVariables);
             
             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);
             addPlan(new CHRSearchPlan(constraint, activeFact, context.getPlanOps()));
             
                 return;
             body.createEnforcePlan(context, priority);
             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);
             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);
                 return;
             body.createEnforcePlan(context, priority);
             /*System.out.println(this);


@@ -124,7 +127,6 @@ public class CHRRule extends Symbol {
     
     private void addPlan(CHRSearchPlan plan) {
         plans.add(plan);
     
     private void addPlan(CHRSearchPlan plan) {
         plans.add(plan);

-        plan.constraint.minimumPriority = Math.min(plan.constraint.minimumPriority, priority);

     }
 
     public String toString() {
     }
 
     public String toString() {