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

fix empty lines in subroutine ast printing

Browse Source
This commit is contained in:
Irmen de Jong 2022-02-11 21:40:29 +01:00
parent b47fc1c020
commit 0cd27d6129
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,10 +101,7 @@ class AstToSourceTextConverter(val output: (text: String) -> Unit, val program:
}
override fun visit(decl: VarDecl) {
// if the vardecl is a parameter of a subroutine, don't output it again
val paramNames = decl.definingSubroutine?.parameters?.map { it.name }
if(paramNames!=null && decl.name in paramNames)
if(decl.origin==VarDeclOrigin.SUBROUTINEPARAM)
return
when(decl.type) {
@ -191,7 +188,7 @@ class AstToSourceTextConverter(val output: (text: String) -> Unit, val program:
else {
outputln("{ ")
scopelevel++
outputStatements(subroutine.statements)
outputStatements(subroutine.statements.filter { it !is VarDecl || it.origin!=VarDeclOrigin.SUBROUTINEPARAM})
scopelevel--
outputi("}")
}

2
compilerInterfaces/src/prog8/compilerinterface/Zeropage.kt
View File

@ -117,7 +117,7 @@ abstract class Zeropage(protected val options: CompilationOptions) {
allocations[address] = name to datatype
if(name.isNotEmpty()) {
allocatedVariables[name] = when(datatype) {
in NumericDatatypes -> ZpAllocation(address, datatype, size, originalScope, null, null) // numerical variables in zeropage never have an initial value here TODO why not?
in NumericDatatypes -> ZpAllocation(address, datatype, size, originalScope, null, null) // numerical variables in zeropage never have an initial value here because they are set in separate initializer assignments
DataType.STR -> ZpAllocation(address, datatype, size, originalScope, initValue as? StringLiteral, null)
in ArrayDatatypes -> ZpAllocation(address, datatype, size, originalScope, null, initValue as? ArrayLiteral)
else -> throw AssemblyError("invalid dt")

3
docs/source/todo.rst
View File

@ -3,8 +3,7 @@ TODO
For next release
^^^^^^^^^^^^^^^^
- answer the question in zeropage.kt makeAllocation(): numerical variables in zeropage never have an initial value here TODO why not?
- (for 7.9:) remove support for old @"screencodes" string encoding syntax, parser+code+docs
- remove support for old @"screencodes" string encoding syntax, parser+code+docs
- ...

10
examples/test.p8
View File

@ -1,12 +1,10 @@
%zeropage basicsafe
main {
ubyte @requirezp foobar2 = 255
sub start() {
cx16.r0=0
void routine22(1,2,3,4,5)
}
sub routine22(ubyte aa1, ubyte aa2, ubyte aa3, ubyte aa4, ubyte aa5) -> ubyte {
return aa1+aa2+aa3+aa4+aa5
ubyte @requirezp foobar = 255
foobar++
foobar2++
}
}