6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-01-12 03:30:09 +00:00
Code Issues Projects Releases Wiki Activity

Fixed format of array contents in assembly output

Browse Source
This commit is contained in:
Karol Stasiak 2018-03-24 17:11:10 +01:00
parent b28dd13c5c
commit 0355495aff
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/scala/millfork/output/Assembler.scala
View File

@ -225,8 +225,11 @@ class Assembler(private val program: Program, private val rootEnv: Environment,
bank0.readable(index) = true
index += 1
}
items.grouped(16).foreach {group =>
assembly.append(" !byte " + group.mkString(", "))
items.grouped(16).foreach { group =>
assembly.append(" !byte " + group.map(expr => env.eval(expr) match {
case Some(c) => c.quickSimplify.toString
case None => "<? unknown constant ?>"
}).mkString(", "))
}
initializedVariablesSize += items.length
case thing@InitializedArray(name, Some(_), items, _) => ???
@ -290,8 +293,11 @@ class Assembler(private val program: Program, private val rootEnv: Environment,
}
index += 1
}
items.grouped(16).foreach {group =>
assembly.append(" !byte " + group.mkString(", "))
items.grouped(16).foreach { group =>
assembly.append(" !byte " + group.map(expr => env.eval(expr) match {
case Some(c) => c.quickSimplify.toString
case None => "<? unknown constant ?>"
}).mkString(", "))
}
initializedVariablesSize += items.length
justAfterCode += bank -> index