Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-11-29 17:50:35 +00:00
Code Issues Projects Releases Wiki Activity

paths are now always relative

Browse Source
This commit is contained in:
Irmen de Jong 2021-10-16 02:43:22 +02:00
parent 0f80897c50
commit 06defd0cb0
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/src/prog8/CompilerMain.kt
View File

@ -85,7 +85,7 @@ private fun compileMain(args: Array<String>): Boolean {
for (importedFile in allImportedFiles) { for (importedFile in allImportedFiles) {
print(" ") print(" ")
println(importedFile) println(importedFile)
val watchDir = importedFile.parent ?: Path.of(".") val watchDir = importedFile.parent ?: Path.of("")
watchDir.register(watchservice, StandardWatchEventKinds.ENTRY_MODIFY) watchDir.register(watchservice, StandardWatchEventKinds.ENTRY_MODIFY)
} }
println("[${LocalDateTime.now().withNano(0)}] Waiting for file changes.") println("[${LocalDateTime.now().withNano(0)}] Waiting for file changes.")

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

@ -1343,8 +1343,8 @@ $repeatLabel lda $counterVar
val sourcePath = Path(stmt.definingModule.source.pathString()) val sourcePath = Path(stmt.definingModule.source.pathString())
val includedPath = sourcePath.resolveSibling(includedName) val includedPath = sourcePath.resolveSibling(includedName)
val pathForAssembler = outputDir // #54: 64tass needs the path *relative to the .asm file* val pathForAssembler = outputDir // #54: 64tass needs the path *relative to the .asm file*
.absolute() // avoid IllegalArgumentExc due to non-absolute path .relativize(absolute path) .toAbsolutePath()
.relativize(includedPath) .relativize(includedPath.toAbsolutePath())
.normalize() // avoid assembler warnings (-Wportable; only some, not all) .normalize() // avoid assembler warnings (-Wportable; only some, not all)
.toString().replace('\\', '/') .toString().replace('\\', '/')
out(" .binary \"$pathForAssembler\" $offset $length") out(" .binary \"$pathForAssembler\" $offset $length")

2
compiler/test/AsmgenTests.kt
View File

@ -79,7 +79,7 @@ locallabel:
val errors = ErrorReporter() val errors = ErrorReporter()
val options = CompilationOptions(OutputType.RAW, LauncherType.NONE, ZeropageType.FULL, emptyList(), false, true, C64Target) val options = CompilationOptions(OutputType.RAW, LauncherType.NONE, ZeropageType.FULL, emptyList(), false, true, C64Target)
val zp = C64MachineDefinition.C64Zeropage(options) val zp = C64MachineDefinition.C64Zeropage(options)
val asmgen = AsmGen(program, errors, zp, options, C64Target, Path.of(".")) val asmgen = AsmGen(program, errors, zp, options, C64Target, Path.of(""))
return asmgen return asmgen
} }

2
compilerAst/src/prog8/parser/Prog8Parser.kt
View File

@ -43,7 +43,7 @@ object Prog8Parser {
} }
private class ParsedModule(source: SourceCode) : private class ParsedModule(source: SourceCode) :
Module(mutableListOf(), Position(source.origin, 1, 0, 0), source) Module(mutableListOf(), Position(source.pathString(), 1, 0, 0), source)
{ {
/** /**

3
compilerAst/src/prog8/parser/SourceCode.kt
View File

@ -65,6 +65,7 @@ sealed class SourceCode {
* filename prefix to designate library files that will be retreived from internal resources rather than disk * filename prefix to designate library files that will be retreived from internal resources rather than disk
*/ */
const val libraryFilePrefix = "library:" const val libraryFilePrefix = "library:"
val curdir: Path = Path.of(".").toAbsolutePath()
} }
/** /**
@ -102,7 +103,7 @@ sealed class SourceCode {
} }
override val isFromResources = false override val isFromResources = false
override val origin = normalized.absolutePathString() override val origin = curdir.relativize(normalized.toAbsolutePath()).normalize().toString()
override fun getCharStream(): CharStream = CharStreams.fromPath(normalized) override fun getCharStream(): CharStream = CharStreams.fromPath(normalized)
} }

2
docs/source/todo.rst
View File

@ -3,7 +3,7 @@ TODO
For next compiler release For next compiler release
^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^
fix github issue #64 about inconsistent absolute path usage re-test https://github.com/irmen/prog8/pull/54 on windows
Blocked by Commander-x16 v39 release Blocked by Commander-x16 v39 release

2
httpCompilerService/src/prog8/http/TestHttp.kt
View File

@ -35,7 +35,7 @@ class RequestParser : Take {
slowCodegenWarnings = true, slowCodegenWarnings = true,
compilationTarget = "c64", compilationTarget = "c64",
sourceDirs = emptyList(), sourceDirs = emptyList(),
outputDir = Path.of(".") outputDir = Path.of("")
) )
return RsJson(Jsonding()) return RsJson(Jsonding())
} }