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

library modules imported from embedded resource now contain proper file path (useful for error messages)

Browse Source
This commit is contained in:
Irmen de Jong 2020-09-26 19:30:17 +02:00
parent 680b2df08a
commit b5fa6c2d0a
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,13 +131,14 @@ internal class ModuleImporter {
if(existing!=null)
return null
val resource = tryGetEmbeddedResource("$moduleName.p8")
val rsc = tryGetEmbeddedResource("$moduleName.p8")
val importedModule =
if(resource!=null) {
if(rsc!=null) {
// load the module from the embedded resource
val (resource, resourcePath) = rsc
resource.use {
println("importing '$moduleName' (library)")
importModule(program, CharStreams.fromStream(it), Paths.get("@embedded@/$moduleName"), true)
importModule(program, CharStreams.fromStream(it), Paths.get("@embedded@/$resourcePath"), true)
}
} else {
val modulePath = discoverImportedModuleFile(moduleName, source, import.position)
@ -148,11 +149,18 @@ internal class ModuleImporter {
return importedModule
}
private fun tryGetEmbeddedResource(name: String): InputStream? {
private fun tryGetEmbeddedResource(name: String): Pair<InputStream, String>? {
val target = CompilationTarget.instance.name
val targetSpecific = object{}.javaClass.getResourceAsStream("/prog8lib/$target/$name")
if(targetSpecific!=null)
return targetSpecific
return object{}.javaClass.getResourceAsStream("/prog8lib/$name")
val targetSpecificPath = "/prog8lib/$target/$name"
val targetSpecificResource = object{}.javaClass.getResourceAsStream(targetSpecificPath)
if(targetSpecificResource!=null)
return Pair(targetSpecificResource, targetSpecificPath)
val generalPath = "/prog8lib/$name"
val generalResource = object{}.javaClass.getResourceAsStream(generalPath)
if(generalResource!=null)
return Pair(generalResource, generalPath)
return null
}
}