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

string concatenation

Browse Source
This commit is contained in:
Sergey Chernov 2025-05-19 11:26:00 +04:00
parent 95e68d6e2a
commit 60db9f3b95
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/src/commonMain/kotlin/net/sergeych/ling/Compiler.kt
View File

@ -148,6 +148,8 @@ class Compiler {
} }
} }
Token.Type.STRING -> statement(t.pos, true) { ObjString(t.value) }
Token.Type.LPAREN -> { Token.Type.LPAREN -> {
// ( subexpr ) // ( subexpr )
parseExpression(tokens)?.also { parseExpression(tokens)?.also {

2
library/src/commonMain/kotlin/net/sergeych/ling/statements.kt
View File

@ -75,7 +75,7 @@ class PlusStatement(
val l = left.execute(context) val l = left.execute(context)
if (l is ObjString) if (l is ObjString)
return ObjString(l.toString() + right.execute(context).toString()) return ObjString(l.toString() + right.execute(context).asStr)
if (l !is Numeric) if (l !is Numeric)
raise("left operand is not number: $l") raise("left operand is not number: $l")

30
library/src/commonTest/kotlin/ScriptTest.kt
View File

@ -8,7 +8,7 @@ import kotlin.test.*
class ScriptTest { class ScriptTest {
@Test @Test
fun parseNumbers() { fun parseNumbersTest() {
fun check(expected: String, type: Token.Type, row: Int, col: Int, src: String, offset: Int = 0) { fun check(expected: String, type: Token.Type, row: Int, col: Int, src: String, offset: Int = 0) {
val source = src.toSource() val source = src.toSource()
assertEquals( assertEquals(
@ -48,7 +48,7 @@ class ScriptTest {
} }
@Test @Test
fun parse0() { fun parse0Test() {
val src = """ val src = """
println("Hello") println("Hello")
println( "world" ) println( "world" )
@ -68,7 +68,7 @@ class ScriptTest {
} }
@Test @Test
fun parse1() { fun parse1Test() {
val src = "2 + 7".toSource() val src = "2 + 7".toSource()
val p = parseLing(src).listIterator() val p = parseLing(src).listIterator()
@ -79,7 +79,7 @@ class ScriptTest {
} }
@Test @Test
fun compileNumbers() = runTest { fun compileNumbersTest() = runTest {
assertEquals(ObjInt(17), eval("17")) assertEquals(ObjInt(17), eval("17"))
assertEquals(ObjInt(17), eval("+17")) assertEquals(ObjInt(17), eval("+17"))
assertEquals(ObjInt(-17), eval("-17")) assertEquals(ObjInt(-17), eval("-17"))
@ -95,7 +95,7 @@ class ScriptTest {
} }
@Test @Test
fun compileBuiltinCalls() = runTest { fun compileBuiltinCallsTest() = runTest {
// println(eval("π")) // println(eval("π"))
val pi = eval("Math.PI") val pi = eval("Math.PI")
assertIs<ObjReal>(pi) assertIs<ObjReal>(pi)
@ -107,7 +107,7 @@ class ScriptTest {
} }
@Test @Test
fun varsAndConsts() = runTest { fun varsAndConstsTest() = runTest {
val context = Context() val context = Context()
assertEquals(ObjVoid,context.eval(""" assertEquals(ObjVoid,context.eval("""
val a = 17 val a = 17
@ -171,7 +171,7 @@ class ScriptTest {
} }
@Test @Test
fun testArithmeticOperators() = runTest { fun arithmeticOperatorsTest() = runTest {
assertEquals(2, eval("5/2").toInt()) assertEquals(2, eval("5/2").toInt())
assertEquals(2.5, eval("5.0/2").toDouble()) assertEquals(2.5, eval("5.0/2").toDouble())
assertEquals(2.5, eval("5/2.0").toDouble()) assertEquals(2.5, eval("5/2.0").toDouble())
@ -190,7 +190,7 @@ class ScriptTest {
} }
@Test @Test
fun testArithmeticParenthesis() = runTest { fun arithmeticParenthesisTest() = runTest {
assertEquals(17, eval("2 + 3 * 5").toInt()) assertEquals(17, eval("2 + 3 * 5").toInt())
assertEquals(17, eval("2 + (3 * 5)").toInt()) assertEquals(17, eval("2 + (3 * 5)").toInt())
assertEquals(25, eval("(2 + 3) * 5").toInt()) assertEquals(25, eval("(2 + 3) * 5").toInt())
@ -198,7 +198,13 @@ class ScriptTest {
} }
@Test @Test
fun testEqNeq() = runTest { fun stringOpTest() = runTest {
assertEquals("foobar", eval(""" "foo" + "bar" """).toString())
assertEquals("foo17", eval(""" "foo" + 17 """).toString())
}
@Test
fun eqNeqTest() = runTest {
assertEquals(ObjBool(true), eval("val x = 2; x == 2")) assertEquals(ObjBool(true), eval("val x = 2; x == 2"))
assertEquals(ObjBool(false), eval("val x = 3; x == 2")) assertEquals(ObjBool(false), eval("val x = 3; x == 2"))
assertEquals(ObjBool(true), eval("val x = 3; x != 2")) assertEquals(ObjBool(true), eval("val x = 3; x != 2"))
@ -214,7 +220,7 @@ class ScriptTest {
} }
@Test @Test
fun testGtLt() = runTest { fun gtLtTest() = runTest {
assertTrue { eval("3 > 2").toBool() } assertTrue { eval("3 > 2").toBool() }
assertFalse { eval("3 > 3").toBool() } assertFalse { eval("3 > 3").toBool() }
assertTrue { eval("3 >= 2").toBool() } assertTrue { eval("3 >= 2").toBool() }
@ -228,5 +234,9 @@ class ScriptTest {
assertFalse { eval("4 <= 3").toBool()} assertFalse { eval("4 <= 3").toBool()}
} }
@Test
fun ifTest() = runTest {
}
} }