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

* ModuleImporter: make tests pass

Browse Source
This commit is contained in:
meisl 2021-06-19 20:30:42 +02:00
parent b071a58ca7
commit b6f780d70d
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,6 @@ import org.antlr.v4.runtime.*
import prog8.ast.IStringEncoding import prog8.ast.IStringEncoding
import prog8.ast.Module import prog8.ast.Module
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.antlr.toAst
import prog8.ast.base.Position import prog8.ast.base.Position
import prog8.ast.base.SyntaxError import prog8.ast.base.SyntaxError
import prog8.ast.statements.Directive import prog8.ast.statements.Directive
@ -41,10 +40,21 @@ class ModuleImporter(private val program: Program,
if(!Files.isReadable(filePath)) if(!Files.isReadable(filePath))
throw ParsingFailedError("No such file: $filePath") throw ParsingFailedError("No such file: $filePath")
val content = filePath.toFile().readText() val module = Prog8Parser.parseModule(filePath)
val cs = CharStreams.fromString(content)
return importModule(cs, filePath) 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, filePath) }
module.statements = lines
return module
} }
fun importLibraryModule(name: String): Module? { fun importLibraryModule(name: String): Module? {