SergeychWorks/lyng
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases 21 Wiki Activity

fixed interpolation bug

Browse Source
This commit is contained in:
Sergey Chernov 2026-03-29 12:35:04 +03:00
parent 966b6a31ae
commit 8a560f5417
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lynglib/src/commonMain/kotlin/net/sergeych/lyng/Parser.kt
View File

@ -732,7 +732,8 @@ private class Parser(fromPos: Pos, private val interpolationEnabled: Boolean = t
}
val expanded = mutableListOf<Token>()
expanded += Token("(", tokenPos, Token.Type.LPAREN)
var emittedPieces = 0
expanded += Token("", tokenPos, Token.Type.STRING)
var emittedPieces = 1
for (chunk in chunks) {
val pieceTokens = when (chunk) {
is StringChunk.Literal -> {
@ -755,9 +756,6 @@ private class Parser(fromPos: Pos, private val interpolationEnabled: Boolean = t
expanded += pieceTokens
emittedPieces++
}
if (emittedPieces == 0) {
expanded += Token("", tokenPos, Token.Type.STRING)
}
expanded += Token(")", tokenPos, Token.Type.RPAREN)
val first = expanded.first()
@ -766,10 +764,21 @@ private class Parser(fromPos: Pos, private val interpolationEnabled: Boolean = t
}
private fun parseEmbeddedExpressionTokens(text: String, exprPos: Pos): List<Token> {
val tokens = parseLyng(Source(exprPos.source.fileName, text), interpolationEnabled)
val tokens = try {
parseLyng(Source(exprPos.source.fileName, text), interpolationEnabled)
} catch (e: ScriptError) {
throw ScriptError(remapEmbeddedPos(exprPos, e.pos), e.errorMessage, e)
}
if (tokens.isEmpty()) return emptyList()
val withoutEof = if (tokens.last().type == Token.Type.EOF) tokens.dropLast(1) else tokens
return withoutEof
return withoutEof.map { it.copy(pos = remapEmbeddedPos(exprPos, it.pos)) }
}
private fun remapEmbeddedPos(exprPos: Pos, embeddedPos: Pos): Pos {
if (embeddedPos.line < 0 || embeddedPos.column < 0) return exprPos
val line = exprPos.line + embeddedPos.line
val column = if (embeddedPos.line == 0) exprPos.column + embeddedPos.column else embeddedPos.column
return Pos(exprPos.source, line, column)
}
private fun readInterpolationExprText(start: Pos): String {

29
lynglib/src/commonTest/kotlin/net/sergeych/lyng/DecimalModuleTest.kt
View File

@ -21,6 +21,7 @@ import com.ionspin.kotlin.bignum.decimal.BigDecimal
import kotlinx.coroutines.test.runTest
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
class DecimalModuleTest {
@Test
@ -266,4 +267,32 @@ class DecimalModuleTest {
assert(X == 42)
""".trimIndent())
}
@Test
fun testDecimalStringInterpolation() = runTest {
eval(
$$"""
import lyng.decimal
var X = "2".d
var re = 50.d
var im = X
val s = "$re + ${im}i"
assertEquals("50 + 2i", s)
""".trimIndent())
}
@Test
fun testDecimalInterpolationSyntaxErrorKeepsOriginalSourcePosition() = runTest {
val ex = assertFailsWith<ScriptError> {
eval(
$$"""
import lyng.decimal
var re = 50.d
val s = "${re + }"
""".trimIndent()
)
}
assertEquals(2, ex.pos.line)
}
}