(refs #7377) Refactoring CHR query parsing

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / elaboration / expressions / block / CHRStatement.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/block/CHRStatement.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/block/CHRStatement.java
index d58f9c360e79c072eeb2723b8216466913a4c8b5..0c41b513a6c502a13a4eb62d631c8f46a544fa6d 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/block/CHRStatement.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/block/CHRStatement.java
@@ -1,17 +1,17 @@
 package org.simantics.scl.compiler.elaboration.expressions.block;
 
 package org.simantics.scl.compiler.elaboration.expressions.block;
 

+import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstQuery;

 import org.simantics.scl.compiler.elaboration.contexts.EnvironmentalContext;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
 import org.simantics.scl.compiler.elaboration.expressions.Expression;
 import org.simantics.scl.compiler.elaboration.contexts.EnvironmentalContext;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
 import org.simantics.scl.compiler.elaboration.expressions.Expression;

-import org.simantics.scl.compiler.elaboration.expressions.list.ListQualifier;

 import org.simantics.scl.compiler.errors.Locations;
 
 public class CHRStatement extends Statement {
 
 import org.simantics.scl.compiler.errors.Locations;
 
 public class CHRStatement extends Statement {
 

-    public ListQualifier[] head;
-    public ListQualifier[] body;
+    public CHRAstQuery head;
+    public CHRAstQuery body;

 
 

-    public CHRStatement(ListQualifier[] head, ListQualifier[] body) {
+    public CHRStatement(CHRAstQuery head, CHRAstQuery body) {

         this.head = head;
         this.body = body;
     }
         this.head = head;
         this.body = body;
     }


@@ -23,13 +23,8 @@ public class CHRStatement extends Statement {
 
     @Override
     public void setLocationDeep(long loc) {
 
     @Override
     public void setLocationDeep(long loc) {

-        if(location == Locations.NO_LOCATION) {
+        if(location == Locations.NO_LOCATION)

             location = loc;
             location = loc;

-            for(ListQualifier lq : head)
-                lq.setLocationDeep(loc);
-            for(ListQualifier lq : body)
-                lq.setLocationDeep(loc);
-        }

     }
 
     @Override
     }
 
     @Override