From 31c946aeeb8954934df1ce032fe097b01e8195bb Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Sat, 22 Aug 2020 16:39:17 +0200
Subject: [PATCH] bugfix

---
 compiler/src/prog8/ast/AstToSourceCode.kt                     | 4 ----
 .../prog8/compiler/target/c64/codegen/ExpressionsAsmGen.kt    | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/compiler/src/prog8/ast/AstToSourceCode.kt b/compiler/src/prog8/ast/AstToSourceCode.kt
index 08b380c2d..3afef97ce 100644
--- a/compiler/src/prog8/ast/AstToSourceCode.kt
+++ b/compiler/src/prog8/ast/AstToSourceCode.kt
@@ -427,8 +427,4 @@ class AstToSourceCode(val output: (text: String) -> Unit, val program: Program):
             whenChoice.statements.accept(this)
         outputln("")
     }
-
-    override fun visit(nopStatement: NopStatement) {
-        output("; NOP @ ${nopStatement.position}  $nopStatement")
-    }
 }
diff --git a/compiler/src/prog8/compiler/target/c64/codegen/ExpressionsAsmGen.kt b/compiler/src/prog8/compiler/target/c64/codegen/ExpressionsAsmGen.kt
index b63d6efb7..0a5268652 100644
--- a/compiler/src/prog8/compiler/target/c64/codegen/ExpressionsAsmGen.kt
+++ b/compiler/src/prog8/compiler/target/c64/codegen/ExpressionsAsmGen.kt
@@ -253,6 +253,7 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
                         }
                         else -> throw AssemblyError("weird type")
                     }
+                    return
                 }
             }
             "<<" -> {
@@ -278,6 +279,7 @@ internal class ExpressionsAsmGen(private val program: Program, private val asmge
                         else
                             asmgen.out(" jsr  math.shift_left_w_$left")
                     }
+                    return
                 }
             }
             "*" -> {