From f4b3d1905979650a1e6dceb45e516711c433bd2c Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Sun, 10 Oct 2021 22:26:18 +0200 Subject: [PATCH] fix merge conflict --- compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt b/compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt index 7510d048d..f1e991129 100644 --- a/compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt +++ b/compilerAst/src/prog8/ast/antlr/Antlr2Kotlin.kt @@ -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 { /*