Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-09-25 08:25:32 +00:00
Code Issues Projects Releases Wiki Activity

improvements for inlined subroutines: fix identifier scoping

Browse Source
This commit is contained in:
Irmen de Jong
2021-04-01 23:04:13 +02:00
parent fe2954ce08
commit 02e12d8575
8 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compilerAst/src/prog8/ast/AstToSourceCode.kt
View File

@@ -137,8 +137,11 @@ class AstToSourceCode(val output: (text: String) -> Unit, val program: Program):
override fun visit(subroutine: Subroutine) {
output("\n")
outputi("")
if(subroutine.inline)
output("inline ")
if(subroutine.isAsmSubroutine) {
outputi("asmsub ${subroutine.name} (")
output("asmsub ${subroutine.name} (")
for(param in subroutine.parameters.zip(subroutine.asmParameterRegisters)) {
val reg =
when {
@@ -152,7 +155,7 @@ class AstToSourceCode(val output: (text: String) -> Unit, val program: Program):
}
}
else {
outputi("sub ${subroutine.name} (")
output("sub ${subroutine.name} (")
for(param in subroutine.parameters) {
output("${datatypeString(param.type)} ${param.name}")
if(param!==subroutine.parameters.last())

3
compilerAst/src/prog8/ast/expressions/AstExpressions.kt
View File

@@ -711,8 +711,7 @@ internal fun makeRange(fromVal: Int, toVal: Int, stepVal: Int): IntProgression {
}
}
data class IdentifierReference(val nameInSource: List<String>, override val position: Position) : Expression(),
IAssignable {
data class IdentifierReference(val nameInSource: List<String>, override val position: Position) : Expression(), IAssignable {
override lateinit var parent: Node
fun targetStatement(program: Program) =