Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-02-27 03:29:22 +00:00
Code Issues Projects Releases Wiki Activity

fix %option merge possible error

Browse Source
This commit is contained in:
Irmen de Jong 2023-04-29 00:01:59 +02:00
parent 9ca71bc937
commit 798383596d
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/src/prog8/compiler/ModuleImporter.kt
View File

@ -114,6 +114,9 @@ class ModuleImporter(private val program: Program,
if(existingBlock!=null) {
existingBlock.statements.addAll(block.statements.filter { it !is Directive })
importedModule.statements.remove(block)
} else {
val merges = block.statements.filter { it is Directive && it.directive=="%option" && it.args.any { a->a.name=="merge" } }
block.statements.removeAll(merges)
}
}
}

1
compiler/src/prog8/compiler/astprocessing/IntermediateAstMaker.kt
View File

@ -168,6 +168,7 @@ class IntermediateAstMaker(private val program: Program, private val options: Co
"align_word" -> alignment = PtBlock.BlockAlignment.WORD
"align_page" -> alignment = PtBlock.BlockAlignment.PAGE
"force_output" -> forceOutput=true
"merge" -> { /* ignore this one */ }
else -> throw FatalAstException("weird directive option: ${arg.name}")
}
}