Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-07-19 04:28:56 +00:00
Code Issues Projects Releases Wiki Activity

* fix #54 / step 1: relativize threw IllegalArgumentException if called on non-absolute path with absolute path as argument ("different type of path")

Browse Source
This commit is contained in:
meisl 2021-07-17 12:04:49 +02:00
parent ee115b3337
commit 23c99002c0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt
View File

@ -18,6 +18,7 @@ import java.nio.file.Paths
import java.time.LocalDate
import java.time.LocalDateTime
import java.util.*
import kotlin.io.path.absolute
import kotlin.math.absoluteValue
@ -1315,11 +1316,14 @@ $repeatLabel lda $counterVar
assemblyLines.add(sourcecode.trimEnd().trimStart('\n'))
}
"%asmbinary" -> {
val includedName = stmt.args[0].str!!
val offset = if(stmt.args.size>1) ", ${stmt.args[1].int}" else ""
val length = if(stmt.args.size>2) ", ${stmt.args[2].int}" else ""
val includedSourcePath = stmt.definingModule().source.resolveSibling(stmt.args[0].str)
val relPath = Paths.get("").relativize(includedSourcePath)
out(" .binary \"$relPath\" $offset $length")
val includedPath = stmt.definingModule().source.resolveSibling(includedName)
val pathForAssembler = Paths.get("")
.absolute() // avoid IllegalArgumentExc in case non-absolute path .relativize(absolute path)
.relativize(includedPath)
out(" .binary \"$pathForAssembler\" $offset $length")
}
"%breakpoint" -> {
val label = "_prog8_breakpoint_${breakpointLabels.size+1}"