Further speed up for compilation of string interpolation (StrategoXT/…

…896)
metaborg · Nov 6, 2013 · b869015 · b869015
1 parent b0a4668
commit b869015
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/strategoxt/stratego-libraries/lib/spec/term/string.str b/strategoxt/stratego-libraries/lib/spec/term/string.str
@@ -1337,6 +1337,13 @@ strategies
   		; prim("SSL_stacktrace_get_all_frame_names",|); ?[ _ | y]
   		; !y
   		; report-failure(|"Internal error: escaped term in string quotation is not a string", x)
- }
+      }
+
+  /**
+  * @internal
+  * Used by desugaring of string interpolation $[... [x] ...]
+  */
+  internal-string-interpolation(|t, padded_s) = <internal-ensure-as-string; string-replace(|"\n", padded_s)> t 
+
 
 
diff --git a/strategoxt/stratego-libraries/strc/lib/stratego/strc/front/desugar-string-quotations.str b/strategoxt/stratego-libraries/strc/lib/stratego/strc/front/desugar-string-quotations.str
@@ -141,9 +141,7 @@ strategies
    * Adjust padding of quoted string escapes.
    */
   string-escape-padd(|n) :
-    StringEscape1(s, t) -> <desugar> Term |[
-      <!t; internal-ensure-as-string(|); string-replace(|"\n", ~str:s_padded {^[]})>
-    ]|
+    StringEscape1(s, t) -> <desugar> Term |[ <internal-string-interpolation(|t, ~str:s_padded)> ]|
     with
       s_padded := <string-as-chars(!['\n' | <remove-padding-single-line(|n)>])> s
 

diff --git a/strategoxt/test.sh b/strategoxt/test.sh
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+./build.sh
+ANT_OPTS="-Xss8m -Xmx1024m" ant -lib dist/share/strategoxt/strategoxt.jar test