Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-01-12 04:30:03 +00:00
Code Issues Projects Releases Wiki Activity

fix invalid code when subroutines are defined in a repeat loop

Browse Source
This commit is contained in:
Irmen de Jong 2023-06-13 00:46:32 +02:00
parent 373cbb4144
commit b9abf37a7e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/src/prog8/compiler/astprocessing/CodeDesugarer.kt
View File

@ -125,13 +125,21 @@ _after:
override fun after(repeatLoop: RepeatLoop, parent: Node): Iterable<IAstModification> {
if(repeatLoop.iterations==null) {
// replace with a jump at the end, but make sure the jump is inserted *before* any subroutines that may occur inside this block
val subroutineMovements = mutableListOf<IAstModification>()
val subroutines = repeatLoop.body.statements.filterIsInstance<Subroutine>()
subroutines.forEach { sub ->
subroutineMovements += IAstModification.Remove(sub, sub.parent as IStatementContainer)
subroutineMovements += IAstModification.InsertLast(sub, sub.parent as IStatementContainer)
}
val label = program.makeLabel("repeat", repeatLoop.position)
val jump = program.jumpLabel(label)
return listOf(
IAstModification.InsertFirst(label, repeatLoop.body),
IAstModification.InsertLast(jump, repeatLoop.body),
IAstModification.ReplaceNode(repeatLoop, repeatLoop.body, parent)
)
) + subroutineMovements
}
return noModifications
}