From c282b4cb9fcf2d6b7c9e772abe2b4604975251e4 Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Wed, 7 Oct 2020 23:24:30 +0200
Subject: [PATCH] code style

---
 .../src/prog8/compiler/target/c64/Petscii.kt  | 38 ++++++++++---------
 .../compiler/target/c64/codegen/AsmGen.kt     |  2 +-
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/compiler/src/prog8/compiler/target/c64/Petscii.kt b/compiler/src/prog8/compiler/target/c64/Petscii.kt
index 2b92af0d0..07f2f2086 100644
--- a/compiler/src/prog8/compiler/target/c64/Petscii.kt
+++ b/compiler/src/prog8/compiler/target/c64/Petscii.kt
@@ -1054,15 +1054,16 @@ object Petscii {
         val lookup = if(lowercase) encodingPetsciiLowercase else encodingPetsciiUppercase
         return text.map {
             val petscii = lookup[it]
-            petscii?.toShort() ?: if(it=='\u0000')
-                0.toShort()
-            else if(it in '\u8000'..'\u80ff') {
-                // special case: take the lower 8 bit hex value directly
-                (it.toInt() - 0x8000).toShort()
-            }
-            else {
-                val case = if (lowercase) "lower" else "upper"
-                throw CharConversionException("no ${case}case Petscii character for '$it' (${it.toShort()})")
+            petscii?.toShort() ?: when (it) {
+                '\u0000' -> 0.toShort()
+                in '\u8000'..'\u80ff' -> {
+                    // special case: take the lower 8 bit hex value directly
+                    (it.toInt() - 0x8000).toShort()
+                }
+                else -> {
+                    val case = if (lowercase) "lower" else "upper"
+                    throw CharConversionException("no ${case}case Petscii character for '$it' (${it.toShort()})")
+                }
             }
         }
     }
@@ -1076,15 +1077,16 @@ object Petscii {
         val lookup = if(lowercase) encodingScreencodeLowercase else encodingScreencodeUppercase
         return text.map{
             val screencode = lookup[it]
-            screencode?.toShort() ?: if(it=='\u0000')
-                0.toShort()
-            else if(it in '\u8000'..'\u80ff') {
-                // special case: take the lower 8 bit hex value directly
-                (it.toInt() - 0x8000).toShort()
-            }
-            else {
-                val case = if (lowercase) "lower" else "upper"
-                throw CharConversionException("no ${case}Screencode character for '$it' (${it.toShort()})")
+            screencode?.toShort() ?: when (it) {
+                '\u0000' -> 0.toShort()
+                in '\u8000'..'\u80ff' -> {
+                    // special case: take the lower 8 bit hex value directly
+                    (it.toInt() - 0x8000).toShort()
+                }
+                else -> {
+                    val case = if (lowercase) "lower" else "upper"
+                    throw CharConversionException("no ${case}Screencode character for '$it' (${it.toShort()})")
+                }
             }
         }
     }
diff --git a/compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt b/compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt
index 8f8e51ba2..c57b6afe5 100644
--- a/compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt
+++ b/compiler/src/prog8/compiler/target/c64/codegen/AsmGen.kt
@@ -541,7 +541,7 @@ internal class AsmGen(private val program: Program,
     internal fun fixNameSymbols(name: String) = name.replace("<", "prog8_").replace(">", "")     // take care of the autogenerated invalid (anon) label names
 
 
-    private val saveRegisterLabels = Stack<String>();
+    private val saveRegisterLabels = Stack<String>()
 
     internal fun saveRegister(register: CpuRegister, dontUseStack: Boolean) {
         if(dontUseStack) {