From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Wed, 16 Aug 2017 09:48:01 +0000 (+0300)
Subject: (refs #7436) Added location information for string interpolation
X-Git-Tag: v1.31.0~238
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=1f2aad0097f93133625811b91c08d0f1b6d31c79;p=simantics%2Fplatform.git

(refs #7436) Added location information for string interpolation

Change-Id: I8f7ef2b89ca8359c4de1944a36ae4b9688bfca18
---

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EStringLiteral.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EStringLiteral.java
index 58ec41fd2..ff830720c 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EStringLiteral.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EStringLiteral.java
@@ -22,7 +22,9 @@ public class EStringLiteral extends ASTExpression {
         SCLValue showForPrinting = context.getEnvironment().getValue(Names.Prelude_showForPrinting);
         for(int i=0;i<expressions.length;++i)
             components[i] = new EApply(new EConstant(showForPrinting), expressions[i]);
-        return new EApply(new ELiteral(new StringInterpolation(strings)), components).resolve(context);
+        EApply result = new EApply(new ELiteral(new StringInterpolation(strings)), components);
+        result.setLocationDeep(location);
+        return result.resolve(context);
     }
 
     @Override
@@ -47,7 +49,9 @@ public class EStringLiteral extends ASTExpression {
             context.getErrorLog().log(location, "String interpolation can be a pattern only if has one hole.");
             return new EError();
         }
-        return new EApply(new ELiteral(new StringInterpolation(strings)), expressions);
+        EApply result = new EApply(new ELiteral(new StringInterpolation(strings)), expressions);
+        result.setLocationDeep(location);
+        return result;
     }
 
     @Override