Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-01-11 13:29:45 +00:00
Code Issues Projects Releases Wiki Activity

moved prog8lib into compiler directory

Browse Source
This commit is contained in:
Irmen de Jong 2019-01-08 01:47:59 +01:00
parent b8b531276d
commit d5250a97c2
7 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/compile.cmd
View File

@ -1,4 +1,4 @@
set PROG8_LIBDIR=../prog8lib rem set PROG8_LIBDIR=../prog8lib
set PROG8CLASSPATH=out/production/compiler/ set PROG8CLASSPATH=out/production/compiler/
set KOTLINPATH=%USERPROFILE%/.IdeaIC2018.3/config/plugins/Kotlin set KOTLINPATH=%USERPROFILE%/.IdeaIC2018.3/config/plugins/Kotlin
set LIBJARS=%KOTLINPATH%/lib/kotlin-stdlib.jar;%KOTLINPATH%/lib/kotlin-reflect.jar;antlr/lib/antlr-runtime-4.7.2.jar set LIBJARS=%KOTLINPATH%/lib/kotlin-stdlib.jar;%KOTLINPATH%/lib/kotlin-reflect.jar;antlr/lib/antlr-runtime-4.7.2.jar

2
compiler/compile.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env sh #!/usr/bin/env sh
PROG8_LIBDIR=../prog8lib # PROG8_LIBDIR=../prog8lib
PROG8CLASSPATH=out/production/compiler PROG8CLASSPATH=out/production/compiler
KOTLINPATH=${HOME}/.IntelliJIdea2018.3/config/plugins/Kotlin KOTLINPATH=${HOME}/.IntelliJIdea2018.3/config/plugins/Kotlin
LIBJARS=${KOTLINPATH}/lib/kotlin-stdlib.jar:${KOTLINPATH}/lib/kotlin-reflect.jar:antlr/lib/antlr-runtime-4.7.2.jar LIBJARS=${KOTLINPATH}/lib/kotlin-stdlib.jar:${KOTLINPATH}/lib/kotlin-reflect.jar:antlr/lib/antlr-runtime-4.7.2.jar

0
prog8lib/c64flt.p8 → compiler/prog8lib/c64flt.p8
View File

0
prog8lib/c64lib.p8 → compiler/prog8lib/c64lib.p8
View File

0
prog8lib/c64utils.p8 → compiler/prog8lib/c64utils.p8
View File

0
prog8lib/prog8lib.p8 → compiler/prog8lib/prog8lib.p8
View File

9
compiler/src/prog8/parser/ModuleParsing.kt
View File

@ -23,8 +23,13 @@ private class LexerErrorListener: BaseErrorListener() {
fun importModule(filePath: Path) : Module { fun importModule(filePath: Path) : Module {
print("importing '${filePath.fileName}'") print("importing '${filePath.fileName}'")
if(filePath.parent!=null) if(filePath.parent!=null) {
println(" (from '${filePath.parent}')") var importloc = filePath.toString()
val curdir = Paths.get("").toAbsolutePath().toString()
if(importloc.startsWith(curdir))
importloc = "." + importloc.substring(curdir.length)
println(" (from '$importloc')")
}
else else
println("") println("")
if(!Files.isReadable(filePath)) if(!Files.isReadable(filePath))