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%2FCHRQuery.java;h=c7ac33d889f208dade23dee4d78daee3d500b963;hb=fe1a2f532761669e67da4db4ae15096ced8a04db;hp=8bcd14b38c66e6903a5f69e39b09618e387e69ee;hpb=1b4d8b692f40d946deb5db8280eb4ca5b36a75a7;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRQuery.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRQuery.java
index 8bcd14b38..c7ac33d88 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRQuery.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/CHRQuery.java
@@ -1,94 +1,81 @@
-package org.simantics.scl.compiler.elaboration.chr;
-
-import org.simantics.scl.compiler.elaboration.chr.plan.PostCommitOp;
-import org.simantics.scl.compiler.elaboration.chr.plan.PreCommitOp;
-import org.simantics.scl.compiler.elaboration.chr.planning.QueryPlanningContext;
-import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;
-import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
-import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
-import org.simantics.scl.compiler.elaboration.expressions.Expression;
-import org.simantics.scl.compiler.elaboration.expressions.Variable;
-import org.simantics.scl.compiler.elaboration.expressions.VariableProcedure;
-import org.simantics.scl.compiler.elaboration.expressions.printing.ExpressionToStringVisitor;
-import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.parsing.Symbol;
-
-import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.set.hash.THashSet;
-import gnu.trove.set.hash.TIntHashSet;
-
-public class CHRQuery extends Symbol {
-    public CHRLiteral[] literals;
-
-    public CHRQuery(CHRLiteral[] literals) {
-        this.literals = literals;
-    }
-
-    public void resolve(TranslationContext context) {
-        for(CHRLiteral literal : literals)
-            literal.resolve(context);
-    }
-
-    public void collectRefs(TObjectIntHashMap<Object> allRefs, TIntHashSet refs) {
-        for(CHRLiteral literal : literals)
-            literal.collectRefs(allRefs, refs);
-    }
-
-    public void checkType(TypingContext context) {
-        for(CHRLiteral literal : literals)
-            literal.checkType(context);
-    }
-    
-    public void collectVars(TObjectIntHashMap<Variable> allVars, TIntHashSet vars) {
-        for(CHRLiteral literal : literals)
-            literal.collectVars(allVars, vars);
-    }
-
-    public void forVariables(VariableProcedure procedure) {
-        for(CHRLiteral literal : literals)
-            literal.forVariables(procedure);
-    }
-
-    public void collectFreeVariables(THashSet<Variable> vars) {
-        for(CHRLiteral literal : literals)
-            literal.collectFreeVariables(vars);
-    }
-
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            this.location = loc;
-            for(CHRLiteral literal : literals)
-                literal.setLocationDeep(loc);
-        }
-    }
-    
-    public void createQueryPlan(QueryPlanningContext context, Expression inputFact, int activeLiteralId) {
-        for(int i=0;i<literals.length;++i) {
-            CHRLiteral literal = literals[i];
-            if(i == activeLiteralId)
-                context.activate(literal, inputFact, i);
-            else
-                context.add(literal, i);
-        }
-        context.createQueryPlan();
-    }
-    
-    public void simplify(SimplificationContext context) {
-        for(CHRLiteral literal : literals)
-            literal.simplify(context);
-    }
-
-    public void createEnforcePlan(QueryPlanningContext context, int priority) {
-        context.addPlanOp(new PreCommitOp(location));
-        for(CHRLiteral literal : literals)
-            context.claim(context, literal);
-        context.addPlanOp(new PostCommitOp(location, priority));
-    }
-    
-    public String toString() {
-        StringBuilder b = new StringBuilder();
-        ExpressionToStringVisitor visitor = new ExpressionToStringVisitor(b);
-        visitor.visit(this);
-        return b.toString();
-    }
-}
+package org.simantics.scl.compiler.elaboration.chr;
+
+import org.simantics.scl.compiler.elaboration.chr.plan.PostCommitOp;
+import org.simantics.scl.compiler.elaboration.chr.plan.PreCommitOp;
+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;
+import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
+import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
+import org.simantics.scl.compiler.elaboration.expressions.Expression;
+import org.simantics.scl.compiler.elaboration.expressions.Variable;
+import org.simantics.scl.compiler.elaboration.expressions.printing.ExpressionToStringVisitor;
+import org.simantics.scl.compiler.errors.Locations;
+import org.simantics.scl.compiler.internal.parsing.Symbol;
+
+import gnu.trove.map.hash.TObjectIntHashMap;
+import gnu.trove.set.hash.TIntHashSet;
+
+public class CHRQuery extends Symbol {
+    public CHRLiteral[] literals;
+
+    public CHRQuery(CHRLiteral[] literals) {
+        this.literals = literals;
+    }
+
+    public void resolve(TranslationContext context) {
+        for(CHRLiteral literal : literals)
+            literal.resolve(context);
+    }
+
+    public void checkType(TypingContext context) {
+        for(CHRLiteral literal : literals)
+            literal.checkType(context);
+    }
+    
+    public void collectVars(TObjectIntHashMap<Variable> allVars, TIntHashSet vars) {
+        for(CHRLiteral literal : literals)
+            literal.collectVars(allVars, vars);
+    }
+    
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            this.location = loc;
+            for(CHRLiteral literal : literals)
+                literal.setLocationDeep(loc);
+        }
+    }
+    
+    public boolean createQueryPlan(QueryPlanningContext context, Expression inputFact, int activeLiteralId, CHRConstraint initConstraint) {
+        for(int i=0;i<literals.length;++i) {
+            CHRLiteral literal = literals[i];
+            if(i == activeLiteralId)
+                context.activate(literal, inputFact, i);
+            else
+                context.add(literal, i);
+        }
+        if(activeLiteralId == -1 && inputFact != null) {
+            context.addInitFact(initConstraint, inputFact);
+        }	
+        return context.createQueryPlan();
+    }
+    
+    public void simplify(SimplificationContext context) {
+        for(CHRLiteral literal : literals)
+            literal.simplify(context);
+    }
+
+    public void createEnforcePlan(QueryPlanningContext context, int priority) {
+        context.addPlanOp(new PreCommitOp(location));
+        for(CHRLiteral literal : literals)
+            context.claim(context, literal);
+        context.addPlanOp(new PostCommitOp(location, priority));
+    }
+    
+    public String toString() {
+        StringBuilder b = new StringBuilder();
+        ExpressionToStringVisitor visitor = new ExpressionToStringVisitor(b);
+        visitor.visit(this);
+        return b.toString();
+    }
+}