Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-11-01 06:16:15 +00:00
Code Issues Projects Releases Wiki Activity

fix symbol prefixing on goto with expression

Browse Source 
added coroutines example
This commit is contained in:
Irmen de Jong
2024-12-17 12:52:01 +01:00
parent 8ea032ed66
commit 7c79cdbd2f
11 changed files with 149 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
codeGenCpu6502/src/prog8/codegen/cpu6502/AsmGen.kt
View File

@@ -73,16 +73,6 @@ class AsmGen6502(val prefixSymbols: Boolean, private val lastGeneratedLabelSeque
nodesToPrefix += node.parent to index
}
}
is PtJump -> {
val identifier = node.target as? PtIdentifier
if(identifier!=null) {
val stNode = st.lookup(identifier.name) ?: throw AssemblyError("name not found $identifier")
if (stNode.astNode.definingBlock()?.options?.noSymbolPrefixing != true) {
val index = node.parent.children.indexOf(node)
nodesToPrefix += node.parent to index
}
}
}
is PtBlock -> prefixNamedNode(node)
is PtConstant -> prefixNamedNode(node)
is PtLabel -> prefixNamedNode(node)
@@ -107,7 +97,6 @@ class AsmGen6502(val prefixSymbols: Boolean, private val lastGeneratedLabelSeque
when(val node = parent.children[index]) {
is PtIdentifier -> parent.children[index] = node.prefix(parent, st)
is PtFunctionCall -> throw AssemblyError("PtFunctionCall should be processed in their own list, last")
is PtJump -> parent.children[index] = node.prefix(parent, st)
is PtVariable -> parent.children[index] = node.prefix(parent, st)
else -> throw AssemblyError("weird node to prefix $node")
}
@@ -177,17 +166,6 @@ private fun PtVariable.prefix(parent: PtNode, st: SymbolTable): PtVariable {
else this
}
private fun PtJump.prefix(parent: PtNode, st: SymbolTable): PtJump {
val identifier = target as? PtIdentifier
if(identifier!=null) {
val prefixedIdent = identifier.prefix(this, st)
val jump = PtJump(prefixedIdent, position)
jump.parent = parent
return jump
}
return this
}
private fun PtFunctionCall.prefix(parent: PtNode): PtFunctionCall {
val newName = prefixScopedName(name, 's')
val call = PtFunctionCall(newName, void, type, position)