Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-04 22:58:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed two bugs in assembler.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2021-04-26 16:08:05 +02:00
parent c093cb813e
commit cd830a7388
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Assembly.kt
View File

@ -422,9 +422,11 @@ private class Assembler(private val asm: List<String>, private val inlineStackAr
// Coarse source position, including surrounding whitespace. // Coarse source position, including surrounding whitespace.
val coarseCol = prevCol + prevLen val coarseCol = prevCol + prevLen
val coarseLen = val coarseLen = when (nextToken) {
if (nextToken === Token.ArgSeparator) nextCol + nextLen - coarseCol Token.ArgSeparator -> nextCol + nextLen - coarseCol
else nextCol - coarseCol null -> nextCol - coarseCol + 1
else -> nextCol - coarseCol
}
if (token === Token.ArgSeparator) { if (token === Token.ArgSeparator) {
if (shouldBeArg) { if (shouldBeArg) {
@ -503,7 +505,7 @@ private class Assembler(private val asm: List<String>, private val inlineStackAr
else -> { else -> {
typeMatch = false typeMatch = false
UnknownArg(value!!) UnknownArg(value)
} }
} }
@ -553,10 +555,9 @@ private class Assembler(private val asm: List<String>, private val inlineStackAr
} }
} }
if (stack) { // Inject stack push instructions if necessary. Don't inject push instruction if
// Inject stack push instructions if necessary. // there's no parameter for the argument (i.e. too many arguments).
checkNotNull(paramType) if (stack && paramType != null) {
// If the token is a register, push it as a register, otherwise coerce type. // If the token is a register, push it as a register, otherwise coerce type.
if (token === Token.Register) { if (token === Token.Register) {
if (paramType is RegType) { if (paramType is RegType) {