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

Fix text literals as expressions

Browse Source
This commit is contained in:
Karol Stasiak 2019-07-19 15:46:38 +02:00
parent 12d32594d1
commit 07a29643a8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/millfork/compiler/AbstractStatementPreprocessor.scala
View File

@ -111,7 +111,7 @@ abstract class AbstractStatementPreprocessor(protected val ctx: CompilationConte
stmt match {
case Assignment(ve@VariableExpression(v), arg) if trackableVars(v) =>
cv = search(arg, cv)
Assignment(ve, optimizeExpr(arg, cv)).pos(pos) -> (env.eval(arg, currentVarValues) match {
Assignment(ve, optimizeExpr(arg, cv)).pos(pos) -> (env.eval(optimizeExpr(arg, Map()), currentVarValues) match {
case Some(c) => cv + (v -> c)
case None => cv - v
})

1
src/main/scala/millfork/env/Environment.scala vendored
View File

@ -591,6 +591,7 @@ class Environment(val parent: Option[Environment], val prefix: String, val cpuFa
private def evalImpl(e: Expression, vv: Option[Map[String, Constant]]): Option[Constant] = {
e match {
case LiteralExpression(value, size) => Some(NumericConstant(value, size))
case _:TextLiteralExpression => ???
case ConstantArrayElementExpression(c) => Some(c)
case GeneratedConstantExpression(c, t) => Some(c)
case VariableExpression(name) =>