From 605df7c91cd67dfc4345db469a8ccd768a34238f Mon Sep 17 00:00:00 2001
From: Elektron72 <36974021+Elektron72@users.noreply.github.com>
Date: Mon, 29 Mar 2021 17:21:48 -0400
Subject: [PATCH] Move code used for all CBM systems to new package

AssemblyProgram.kt and Petscii.kt are not only used for the Commodore
64; they are also used for the Commander X16, and will likely be used
for any future Commodore systems added to Prog8. Therefore, they should
be moved to a new package containing functionality shared between these
systems.
---
 compiler/src/prog8/compiler/target/ICompilationTarget.kt      | 2 +-
 .../src/prog8/compiler/target/{c64 => cbm}/AssemblyProgram.kt | 2 +-
 compiler/src/prog8/compiler/target/{c64 => cbm}/Petscii.kt    | 2 +-
 compiler/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename compiler/src/prog8/compiler/target/{c64 => cbm}/AssemblyProgram.kt (98%)
 rename compiler/src/prog8/compiler/target/{c64 => cbm}/Petscii.kt (99%)

diff --git a/compiler/src/prog8/compiler/target/ICompilationTarget.kt b/compiler/src/prog8/compiler/target/ICompilationTarget.kt
index c760d6726..5c2108645 100644
--- a/compiler/src/prog8/compiler/target/ICompilationTarget.kt
+++ b/compiler/src/prog8/compiler/target/ICompilationTarget.kt
@@ -11,7 +11,7 @@ import prog8.compiler.CompilationOptions
 import prog8.compiler.IErrorReporter
 import prog8.compiler.Zeropage
 import prog8.compiler.target.c64.C64MachineDefinition
-import prog8.compiler.target.c64.Petscii
+import prog8.compiler.target.cbm.Petscii
 import prog8.compiler.target.cpu6502.codegen.AsmGen
 import prog8.compiler.target.cx16.CX16MachineDefinition
 import java.nio.file.Path
diff --git a/compiler/src/prog8/compiler/target/c64/AssemblyProgram.kt b/compiler/src/prog8/compiler/target/cbm/AssemblyProgram.kt
similarity index 98%
rename from compiler/src/prog8/compiler/target/c64/AssemblyProgram.kt
rename to compiler/src/prog8/compiler/target/cbm/AssemblyProgram.kt
index fee3fcf17..202c02dd4 100644
--- a/compiler/src/prog8/compiler/target/c64/AssemblyProgram.kt
+++ b/compiler/src/prog8/compiler/target/cbm/AssemblyProgram.kt
@@ -1,4 +1,4 @@
-package prog8.compiler.target.c64
+package prog8.compiler.target.cbm
 
 import prog8.compiler.CompilationOptions
 import prog8.compiler.OutputType
diff --git a/compiler/src/prog8/compiler/target/c64/Petscii.kt b/compiler/src/prog8/compiler/target/cbm/Petscii.kt
similarity index 99%
rename from compiler/src/prog8/compiler/target/c64/Petscii.kt
rename to compiler/src/prog8/compiler/target/cbm/Petscii.kt
index 915891208..ff4ef9af6 100644
--- a/compiler/src/prog8/compiler/target/c64/Petscii.kt
+++ b/compiler/src/prog8/compiler/target/cbm/Petscii.kt
@@ -1,4 +1,4 @@
-package prog8.compiler.target.c64
+package prog8.compiler.target.cbm
 
 import java.io.CharConversionException
 
diff --git a/compiler/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt b/compiler/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt
index 744fa7188..b0403a138 100644
--- a/compiler/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt
+++ b/compiler/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt
@@ -9,8 +9,8 @@ import prog8.compiler.*
 import prog8.compiler.functions.BuiltinFunctions
 import prog8.compiler.functions.FSignature
 import prog8.compiler.target.*
-import prog8.compiler.target.c64.AssemblyProgram
-import prog8.compiler.target.c64.Petscii
+import prog8.compiler.target.cbm.AssemblyProgram
+import prog8.compiler.target.cbm.Petscii
 import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignment
 import prog8.compiler.target.cpu6502.codegen.assignment.AssignmentAsmGen
 import java.io.CharConversionException