Update string interpolation syntax

koto-lang · Apr 4, 2024 · ed09708 · ed09708
1 parent aef3fee
commit ed09708
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/grammar.js b/grammar.js
@@ -412,9 +412,8 @@ module.exports = grammar({
         $._string_start,
         repeat(choice(
           $.escape,
-          seq('$', $.identifier),
           seq(
-            "${",
+            "{",
             $._interpolation_start,
             optional($._expressions),
             $._interpolation_end,

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json
diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/strings.txt b/test/corpus/strings.txt
@@ -40,9 +40,9 @@ string"
 string_interpolated
 ===========================================================================================
 
-'foo is $foo'
-'foo, bar is ${foo, bar}'
-'inline comment in expression ${foo, #- bar -# bar}'
+'foo is {foo}'
+'foo, bar is {foo, bar}'
+'inline comment in expression {foo, #- bar -# bar}'
 
 ---
 
@@ -69,7 +69,7 @@ string_interpolated
 escapes
 ===========================================================================================
 
-'foo\n\t\r\\\$bar'
+'foo\n\t\r\\\{bar'
 '\'\'\''
 "\"''\""
 '\x4e foo \xF9'
@@ -114,7 +114,7 @@ escapes
 raw_strings
 ===========================================================================================
 
-r'$foo\r\n'
+r'{foo}\r\n'
 r"'\#"
 r#""bar""#
 r##"#"hi"#"##
@@ -132,8 +132,8 @@ r##"#"hi"#"##
 incomplete_string_interpolation
 ===========================================================================================
 
-'${} x'
-'y ${'
+'{} x'
+'y {'
 
 ---