Another string interpolation test case

camdenorrb · Jan 3, 2022 · a44978f · a44978f
1 parent 9be072e
commit a44978f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/src/main/kotlin/dev/twelveoclock/lang/crescent/parsers/CrescentParser.kt b/src/main/kotlin/dev/twelveoclock/lang/crescent/parsers/CrescentParser.kt
@@ -956,11 +956,12 @@ object CrescentParser {
                                 continue
                             }
 
-                            if (nextChar != '$') {
+                            if (nextChar != '$' || (!iterator.peekNext().isLetter() && iterator.peekNext() != '{')) {
                                 builder.append(nextChar)
                                 continue
                             }
 
+
                             if (builder.isNotEmpty() || (builder.isEmpty() && nodes.isEmpty())) {
                                 nodes += CrescentAST.Node.Primitive.String(builder.toString())
                                 builder.clear()

diff --git a/src/test/kotlin/dev/twelveoclock/lang/crescent/CrescentLexerTests.kt b/src/test/kotlin/dev/twelveoclock/lang/crescent/CrescentLexerTests.kt
@@ -102,6 +102,8 @@ internal class CrescentLexerTests {
                 Data.Comment("Should println dollar sign next to the letter x"),
                 Key("println"), Parenthesis.OPEN, Data.String("\\\$x"), Parenthesis.CLOSE,
 
+                Key("println"), Parenthesis.OPEN, Data.String("$ x"), Parenthesis.CLOSE,
+
                 Bracket.CLOSE,
             ),
             tokens

diff --git a/src/test/kotlin/dev/twelveoclock/lang/crescent/CrescentParserTests.kt b/src/test/kotlin/dev/twelveoclock/lang/crescent/CrescentParserTests.kt
@@ -136,6 +136,8 @@ internal class CrescentParserTests {
 
                 IdentifierCall("println", listOf(Expression(listOf(String(""), Char('$'), ADD)))),
                 IdentifierCall("println", listOf(String("\$x"))),
+
+                IdentifierCall("println", listOf(String("$ x"))),
             ),
             mainFunction.innerCode.nodes,
         )

diff --git a/src/test/kotlin/dev/twelveoclock/lang/crescent/CrescentVMTests.kt b/src/test/kotlin/dev/twelveoclock/lang/crescent/CrescentVMTests.kt
@@ -166,6 +166,7 @@ internal class CrescentVMTests {
 				Hello 0Hello0Hello0 Hello
 				$
 				${'$'}x
+				$ x
 				
 			""".trimIndent(),
 			collectSystemOut {

diff --git a/src/test/kotlin/dev/twelveoclock/lang/crescent/data/TestCode.kt b/src/test/kotlin/dev/twelveoclock/lang/crescent/data/TestCode.kt
@@ -168,6 +168,8 @@ internal object TestCode {
 				
 				# Should println dollar sign next to the letter x
 			    println("\${'$'}x")
+				
+			    println("$ x")
             }
 		"""