Merge pull request #29 from fink-lang/fix-string

fix(strings): fix escape char handling for template expressions

Author: kollhof

package.json

@@ -35,7 +35,7 @@
   "devDependencies": {
     "@fink/cli": "^2.1.0",
     "@fink/jest": "^1.1.0",
-    "@fink/larix": "^4.5.2",
+    "@fink/larix": "4.5.2",
     "@fink/loxia": "^4.5.1",
     "commitizen": "^4.0.3",
     "cz-conventional-changelog": "^3.1.0",

src/lang/literals/string.fnk

@@ -22,7 +22,6 @@ get_str_part = fn ctx, op:
     '`': collect_text(ctx, rx/`|\${/)
     else: collect_text(ctx, rx/'|\${/)
 
-
   # TODO: can we do the escapeing check in the regex above?
   [escaped] = text.match(rx/\\*$/)
 
@@ -31,18 +30,19 @@ get_str_part = fn ctx, op:
       [{type: 'string:text', value: text, loc: {start, end}}, next_ctx]
 
     else:
+      # TODO: stop_value should come from prattler
+      stop_value = curr_value(next_ctx)
       [str_part, final_ctx] = get_str_part(next_ctx, op)
 
       [{
         type: 'string:text',
-        value: `${text}${op}${str_part.value}`,
+        value: `${text}${stop_value}${str_part.value}`,
         loc: {start, end: str_part.loc.end}
       }, final_ctx]
 
 
 get_parts = fn ctx, op:
   [str_part, next_ctx] = get_str_part(ctx, op)
-
   match true:
     # TODO: should not need to escape `$` unless it is `${`
     curr_value(next_ctx) == '\$':

src/lang/literals/string.test.fnk

@@ -31,6 +31,7 @@ describe:: 'strings', fn:
     parse_expr('` \$ \\n \\t \\` \\\\`') eq snapshot
     parse_expr(`' \$ \\n \\t \\' \\\\'`) eq snapshot
     parse_expr(`" \$ \\n \\t \\" \\\\"`) eq snapshot
+    parse_expr(`'foo \\\${bar + spam}'`) eq snapshot
 
 
   it:: 'parses tagged strings', fn:

src/lang/literals/string.test.fnk.snap

@@ -38,6 +38,11 @@ string " (1:0-1:16)
   \` $ \\n \\t \\" \\\\\`
 `;
 
+exports[`strings parses escape characters 4`] = `
+string ' (1:0-1:20)
+  \`foo \\\${bar + spam}\`
+`;
+
 exports[`strings parses multi line strings 1`] = `
 string ' (1:0-4:9)
   \`foobar