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

Enable props/ops/object tests and improve unary/incdec

Browse Source
This commit is contained in:
Sergey Chernov 2026-01-29 02:44:20 +03:00
parent 54d882ce89
commit 70d05f7987
6 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lynglib/src/commonMain/kotlin/net/sergeych/lyng/bytecode/BytecodeCompiler.kt
View File

@ -194,6 +194,8 @@ class BytecodeCompiler(
} }
is BinaryOpRef -> compileBinary(ref) ?: compileEvalRef(ref) is BinaryOpRef -> compileBinary(ref) ?: compileEvalRef(ref)
is UnaryOpRef -> compileUnary(ref) is UnaryOpRef -> compileUnary(ref)
is LogicalAndRef -> compileEvalRef(ref)
is LogicalOrRef -> compileEvalRef(ref)
is AssignRef -> compileAssign(ref) ?: compileEvalRef(ref) is AssignRef -> compileAssign(ref) ?: compileEvalRef(ref)
is AssignOpRef -> compileAssignOp(ref) ?: compileEvalRef(ref) is AssignOpRef -> compileAssignOp(ref) ?: compileEvalRef(ref)
is AssignIfNullRef -> compileAssignIfNull(ref) is AssignIfNullRef -> compileAssignIfNull(ref)
@ -295,7 +297,12 @@ class BytecodeCompiler(
builder.emit(Opcode.NEG_REAL, a.slot, out) builder.emit(Opcode.NEG_REAL, a.slot, out)
CompiledValue(out, SlotType.REAL) CompiledValue(out, SlotType.REAL)
} }
else -> null else -> {
val obj = ensureObjSlot(a)
val methodId = builder.addConst(BytecodeConst.StringVal("negate"))
builder.emit(Opcode.CALL_VIRTUAL, obj.slot, methodId, 0, 0, out)
CompiledValue(out, SlotType.OBJ)
}
} }
UnaryOp.NOT -> { UnaryOp.NOT -> {
when (a.type) { when (a.type) {
@ -307,18 +314,24 @@ class BytecodeCompiler(
} }
SlotType.OBJ, SlotType.UNKNOWN -> { SlotType.OBJ, SlotType.UNKNOWN -> {
val obj = ensureObjSlot(a) val obj = ensureObjSlot(a)
val tmp = allocSlot() val methodId = builder.addConst(BytecodeConst.StringVal("logicalNot"))
builder.emit(Opcode.OBJ_TO_BOOL, obj.slot, tmp) val tmpObj = allocSlot()
builder.emit(Opcode.NOT_BOOL, tmp, out) builder.emit(Opcode.CALL_VIRTUAL, obj.slot, methodId, 0, 0, tmpObj)
builder.emit(Opcode.OBJ_TO_BOOL, tmpObj, out)
} }
else -> return null else -> return null
} }
CompiledValue(out, SlotType.BOOL) CompiledValue(out, SlotType.BOOL)
} }
UnaryOp.BITNOT -> { UnaryOp.BITNOT -> {
if (a.type != SlotType.INT) return null if (a.type == SlotType.INT) {
builder.emit(Opcode.INV_INT, a.slot, out) builder.emit(Opcode.INV_INT, a.slot, out)
CompiledValue(out, SlotType.INT) return CompiledValue(out, SlotType.INT)
}
val obj = ensureObjSlot(a)
val methodId = builder.addConst(BytecodeConst.StringVal("bitNot"))
builder.emit(Opcode.CALL_VIRTUAL, obj.slot, methodId, 0, 0, out)
CompiledValue(out, SlotType.OBJ)
} }
} }
} }
@ -1372,16 +1385,25 @@ class BytecodeCompiler(
} }
} }
SlotType.UNKNOWN -> { SlotType.UNKNOWN -> {
val oneSlot = allocSlot()
val oneId = builder.addConst(BytecodeConst.ObjRef(ObjInt.One))
builder.emit(Opcode.CONST_OBJ, oneId, oneSlot)
val current = allocSlot()
builder.emit(Opcode.BOX_OBJ, slot, current)
if (wantResult && ref.isPost) { if (wantResult && ref.isPost) {
val old = allocSlot() val result = allocSlot()
builder.emit(Opcode.MOVE_INT, slot, old) val op = if (ref.isIncrement) Opcode.ADD_OBJ else Opcode.SUB_OBJ
builder.emit(if (ref.isIncrement) Opcode.INC_INT else Opcode.DEC_INT, slot) builder.emit(op, current, oneSlot, result)
updateSlotType(slot, SlotType.INT) builder.emit(Opcode.MOVE_OBJ, result, slot)
CompiledValue(old, SlotType.INT) updateSlotType(slot, SlotType.OBJ)
CompiledValue(current, SlotType.OBJ)
} else { } else {
builder.emit(if (ref.isIncrement) Opcode.INC_INT else Opcode.DEC_INT, slot) val result = allocSlot()
updateSlotType(slot, SlotType.INT) val op = if (ref.isIncrement) Opcode.ADD_OBJ else Opcode.SUB_OBJ
CompiledValue(slot, SlotType.INT) builder.emit(op, current, oneSlot, result)
builder.emit(Opcode.MOVE_OBJ, result, slot)
updateSlotType(slot, SlotType.OBJ)
CompiledValue(result, SlotType.OBJ)
} }
} }
else -> null else -> null

1
lynglib/src/commonTest/kotlin/ObjectExpressionTest.kt
View File

@ -6,7 +6,6 @@ import kotlin.test.Ignore
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertFailsWith import kotlin.test.assertFailsWith
@Ignore("TODO(bytecode-only): uses fallback")
class ObjectExpressionTest { class ObjectExpressionTest {
@Test @Test

1
lynglib/src/commonTest/kotlin/net/sergeych/lyng/OperatorOverloadingTest.kt
View File

@ -4,7 +4,6 @@ import kotlinx.coroutines.test.runTest
import kotlin.test.Ignore import kotlin.test.Ignore
import kotlin.test.Test import kotlin.test.Test
@Ignore("TODO(bytecode-only): uses fallback")
class OperatorOverloadingTest { class OperatorOverloadingTest {
@Test @Test
fun testBinaryOverloading() = runTest { fun testBinaryOverloading() = runTest {

1
lynglib/src/commonTest/kotlin/net/sergeych/lyng/PropsTest.kt
View File

@ -4,7 +4,6 @@ import kotlinx.coroutines.test.runTest
import kotlin.test.Ignore import kotlin.test.Ignore
import kotlin.test.Test import kotlin.test.Test
@Ignore("TODO(bytecode-only): uses fallback")
class PropsTest { class PropsTest {
@Test @Test

1
lynglib/src/commonTest/kotlin/net/sergeych/lyng/TransientTest.kt
View File

@ -30,7 +30,6 @@ import kotlin.test.assertEquals
import kotlin.test.assertFalse import kotlin.test.assertFalse
import kotlin.test.assertNotNull import kotlin.test.assertNotNull
@Ignore("TODO(bytecode-only): uses fallback")
class TransientTest { class TransientTest {
@Test @Test

4
lynglib/src/jvmTest/kotlin/LynonTests.kt
View File

@ -31,7 +31,7 @@ import kotlin.test.assertContentEquals
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertTrue import kotlin.test.assertTrue
@Ignore("TODO(bytecode-only): uses fallback") @Ignore("TODO(bytecode-only): uses fallback (unary minus, MI, simple types)")
class LynonTests { class LynonTests {
@Test @Test
@ -794,5 +794,3 @@ class Wallet( id, ownerKey, balance=0, createdAt=Instant.now().truncateToSecond(
} }