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

- ModuleImporter: deduplicate code

Browse Source
This commit is contained in:
meisl 2021-08-01 15:37:57 +02:00
parent b8fade23de
commit f2cb89a128
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,21 +38,7 @@ class ModuleImporter(private val program: Program,
var logMsg = "importing '${filePath.nameWithoutExtension}' (from $srcPath)" var logMsg = "importing '${filePath.nameWithoutExtension}' (from $srcPath)"
println(logMsg) println(logMsg)
val module = Prog8Parser.parseModule(SourceCode.fromPath(srcPath)) return importModule(SourceCode.fromPath(srcPath))
module.program = program
module.linkParents(program.namespace)
program.modules.add(module)
// accept additional imports
val lines = module.statements.toMutableList()
lines.asSequence()
.mapIndexed { i, it -> i to it }
.filter { (it.second as? Directive)?.directive == "%import" }
.forEach { executeImportDirective(it.second as Directive, module) }
module.statements = lines
return module
} }
fun importLibraryModule(name: String): Module? { fun importLibraryModule(name: String): Module? {
@ -88,7 +74,7 @@ class ModuleImporter(private val program: Program,
throw SyntaxError("cannot import self", import.position) throw SyntaxError("cannot import self", import.position)
val existing = program.modules.singleOrNull { it.name == moduleName } val existing = program.modules.singleOrNull { it.name == moduleName }
if(existing!=null) if (existing!=null)
return null // TODO: why return null instead of Module instance? return null // TODO: why return null instead of Module instance?
var srcCode = tryGetModuleFromResource("$moduleName.p8", compilationTargetName) var srcCode = tryGetModuleFromResource("$moduleName.p8", compilationTargetName)