mirror of
https://github.com/irmen/prog8.git
synced 2024-09-07 19:54:26 +00:00
- ModuleImporter: deduplicate code
This commit is contained in:
parent
b8fade23de
commit
f2cb89a128
@ -38,21 +38,7 @@ class ModuleImporter(private val program: Program,
|
||||
var logMsg = "importing '${filePath.nameWithoutExtension}' (from $srcPath)"
|
||||
println(logMsg)
|
||||
|
||||
val module = Prog8Parser.parseModule(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
|
||||
return importModule(SourceCode.fromPath(srcPath))
|
||||
}
|
||||
|
||||
fun importLibraryModule(name: String): Module? {
|
||||
|
Loading…
Reference in New Issue
Block a user