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

fix import paths

Browse Source
This commit is contained in:
Irmen de Jong 2021-04-30 00:16:36 +02:00
parent d906fcea0e
commit d5214e2505
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compilerAst/src/prog8/parser/ModuleParsing.kt
View File

@ -158,8 +158,8 @@ class ModuleImporter(val program: Program, val encoder: IStringEncoding, val com
val fileName = "$name.p8" val fileName = "$name.p8"
val libpaths = libdirs.map {Path.of(it)} val libpaths = libdirs.map {Path.of(it)}
val locations = val locations =
(if(source.toString().isEmpty()) libpaths else libpaths.drop(1) + (source.parent ?: Path.of("."))) + (if(source.toString().isEmpty()) libpaths else libpaths.drop(1) + listOf(source.parent ?: Path.of("."))) +
Paths.get(Paths.get("").toAbsolutePath().toString(), "prog8lib") listOf(Paths.get(Paths.get("").toAbsolutePath().toString(), "prog8lib"))
locations.forEach { locations.forEach {
val file = pathFrom(it.toString(), fileName) val file = pathFrom(it.toString(), fileName)