(refs #7866) Better error location for the NPE in compilation

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

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/translation/CHRTranslation.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/translation/CHRTranslation.java
index 260927b74c6c3659e12997035a80cfd5c5fb167a..107905ae32e5debae35bd01f93f7e857cddd1e8a 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/translation/CHRTranslation.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/chr/translation/CHRTranslation.java
@@ -129,13 +129,15 @@ public class CHRTranslation {
     }
 
     public static CHRQuery convertCHRQuery(TranslationContext context, boolean isHead, ListQualifier[] lqs) {
+        long location = Locations.NO_LOCATION;
         ArrayList<CHRLiteral> query = new ArrayList<CHRLiteral>(lqs.length);
         for(ListQualifier qualifier : lqs) {
+            location = Locations.combine(location, qualifier.location);
             CHRLiteral literal = convertListQualifier(context, isHead, qualifier);
             if(literal != null)
                 query.add(literal);
         }
-        return new CHRQuery(query.toArray(new CHRLiteral[query.size()]));
+        return new CHRQuery(location, query.toArray(new CHRLiteral[query.size()]));
     }
     
     /*public static CHRRule convertCHRStatement(TranslationContext context, CHRStatement statement) {