6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-07-01 14:23:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix optimized struct assignments

Browse Source
This commit is contained in:
Karol Stasiak
2019-07-31 22:30:33 +02:00
parent fe25978d14
commit a3a168b90b
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/millfork/compiler/mos/MosStatementCompiler.scala
View File

@ -191,6 +191,10 @@ object MosStatementCompiler extends AbstractStatementCompiler[AssemblyLine] {
case Assignment(dest, source) => case Assignment(dest, source) =>
MosExpressionCompiler.compileAssignment(ctx, source, dest) -> Nil MosExpressionCompiler.compileAssignment(ctx, source, dest) -> Nil
case ExpressionStatement(e@FunctionCallExpression(name, params)) => case ExpressionStatement(e@FunctionCallExpression(name, params)) =>
env.maybeGet[Type](name) match {
case Some(_) =>
params.flatMap(p => MosExpressionCompiler.compile(ctx, p, None, NoBranching))-> Nil
case None =>
env.lookupFunction(name, params.map(p => MosExpressionCompiler.getExpressionType(ctx, p) -> p)) match { env.lookupFunction(name, params.map(p => MosExpressionCompiler.getExpressionType(ctx, p) -> p)) match {
case Some(i: MacroFunction) => case Some(i: MacroFunction) =>
val (paramPreparation, inlinedStatements) = MosMacroExpander.inlineFunction(ctx, i, params, e.position) val (paramPreparation, inlinedStatements) = MosMacroExpander.inlineFunction(ctx, i, params, e.position)
@ -198,6 +202,7 @@ object MosStatementCompiler extends AbstractStatementCompiler[AssemblyLine] {
case _ => case _ =>
MosExpressionCompiler.compile(ctx, e, None, NoBranching) -> Nil MosExpressionCompiler.compile(ctx, e, None, NoBranching) -> Nil
} }
}
case ExpressionStatement(e) => case ExpressionStatement(e) =>
e match { e match {
case VariableExpression(_) | LiteralExpression(_, _) | _:GeneratedConstantExpression => case VariableExpression(_) | LiteralExpression(_, _) | _:GeneratedConstantExpression =>