Merge "Fixed record constructor resolving from namespaces"

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

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EPreCHRSelect.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EPreCHRSelect.java
index 80943f7d8704620edc20ef88fc928e11af447b44..318a407f5a9b60254c68b7d1faf23d69b783f12d 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EPreCHRSelect.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EPreCHRSelect.java
@@ -1,22 +1,20 @@
 package org.simantics.scl.compiler.elaboration.expressions;
 
-import org.simantics.scl.compiler.elaboration.chr.translation.CHRTranslation;
+import org.simantics.scl.compiler.elaboration.chr.ast.CHRAstQuery;
+import org.simantics.scl.compiler.elaboration.chr.ast.CHRQueryTranslationMode;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
-import org.simantics.scl.compiler.elaboration.expressions.list.ListQualifier;
 
 public class EPreCHRSelect extends ASTExpression {
-    ListQualifier[] query;
+    CHRAstQuery query;
     Expression expression;
     
-    public EPreCHRSelect(ListQualifier[] query, Expression expression) {
+    public EPreCHRSelect(CHRAstQuery query, Expression expression) {
         this.query = query;
         this.expression = expression;
     }
 
     @Override
     public Expression resolve(TranslationContext context) {
-        return new ECHRSelect(expression, CHRTranslation.convertCHRQuery(context, true, query)).resolve(context);
+        return new ECHRSelect(expression, query.translate(context, CHRQueryTranslationMode.QUERY_HEAD)).resolve(context);
     }
-
-
 }