6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2024-06-12 06:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Allow the : operator in const-pure functions

Browse Source
This commit is contained in:
Karol Stasiak 2020-09-21 09:08:49 +02:00
parent 2673a486d6
commit 7de23ddd44
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/millfork/env/ConstPureFunctions.scala vendored
View File

@ -1,6 +1,6 @@
package millfork.env
import millfork.node.{Expression, FunctionCallExpression, GeneratedConstantExpression, IfStatement, IndexedExpression, LiteralExpression, ReturnStatement, Statement, SumExpression, VariableExpression}
import millfork.node.{Expression, FunctionCallExpression, GeneratedConstantExpression, IfStatement, IndexedExpression, LiteralExpression, ReturnStatement, SeparateBytesExpression, Statement, SumExpression, VariableExpression}
/**
* @author Karol Stasiak
@ -93,6 +93,9 @@ object ConstPureFunctions {
env.log.error(s"Calling `${vname}` not allowed in const-pure functions", expr.position)
}
checkConstPure(env, index, params)
case SeparateBytesExpression(hi, lo) =>
checkConstPure(env, hi, params)
checkConstPure(env, lo, params)
case _ =>
env.log.error(s"Expression not allowed in const-pure functions", expr.position)

15
src/test/scala/millfork/test/ConstantSuite.scala
View File

@ -95,6 +95,21 @@ class ConstantSuite extends FunSuite with Matchers {
}
test("Const-pure functions 2") {
val m = EmuUnoptimizedRun(
"""
| word output @$c000
| const word BASE = $d800
| const word pair(byte x, byte y) = (x+BASE.hi):y
| const word result = pair(1,2)
| void main() {
| output = result
| }
""".stripMargin)
m.readWord(0xc000) should equal(0xd902)
}
test("Const-pure Fibonacci") {
val m = EmuUnoptimizedRun(
"""