Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-10-07 00:55:33 +00:00
Code Issues Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Irmen de Jong 2021-10-10 22:26:18 +02:00
parent f37fb82d53
commit f4b3d19059
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt
View File

@ -12,13 +12,6 @@ import prog8.parser.Prog8ANTLRParser
private data class NumericLiteral(val number: Number, val datatype: DataType)
// TODO [merge conflict]: not sure if this should be kept?? Is it double??
internal fun Prog8ANTLRParser.ModuleContext.toAst(name: String, source: Path, encoding: IStringEncoding) : Module {
val nameWithoutSuffix = if(name.endsWith(".p8")) name.substringBeforeLast('.') else name
val directives = this.directive().map { it.toAst() }
val blocks = this.block().map { it.toAst(Module.isLibrary(source), encoding) }
return Module(nameWithoutSuffix, (directives + blocks).toMutableList(), toPosition(), source)
}
private fun ParserRuleContext.toPosition() : Position {
/*