From b799f2e05b2af98e0dc74287d49cf39adbca2191 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Tue, 28 Dec 2021 14:18:04 +0100 Subject: [PATCH] codegen package rename --- .../prog8/compiler/target/AssemblyError.kt | 2 +- .../src/prog8/compiler/target/C64Target.kt | 10 ++++---- .../src/prog8/compiler/target/Cx16Target.kt | 10 ++++---- .../target/c64/C64MachineDefinition.kt | 6 ++--- .../prog8/compiler/target/c64/C64Zeropage.kt | 2 +- .../compiler/target/cbm/AssemblyProgram.kt | 2 +- .../src/prog8/compiler/target/cbm/Mflpt5.kt | 2 +- .../src/prog8/compiler/target/cbm/Petscii.kt | 2 +- .../compiler/target/cpu6502/codegen/AsmGen.kt | 24 +++++++++---------- .../target/cpu6502/codegen/AsmOptimizer.kt | 2 +- .../target/cpu6502/codegen/AsmsubHelpers.kt | 2 +- .../cpu6502/codegen/BuiltinFunctionsAsmGen.kt | 8 +++---- .../cpu6502/codegen/ExpressionsAsmGen.kt | 4 ++-- .../target/cpu6502/codegen/ForLoopsAsmGen.kt | 4 ++-- .../cpu6502/codegen/FunctionCallAsmGen.kt | 12 +++++----- .../cpu6502/codegen/PostIncrDecrAsmGen.kt | 4 ++-- .../codegen/assignment/AsmAssignment.kt | 6 ++--- .../codegen/assignment/AssignmentAsmGen.kt | 6 ++--- .../assignment/AugmentableAssignmentAsmGen.kt | 6 ++--- .../target/cx16/CX16MachineDefinition.kt | 6 ++--- .../compiler/target/cx16/CX16Zeropage.kt | 2 +- 21 files changed, 61 insertions(+), 61 deletions(-) diff --git a/codeGeneration/src/prog8/compiler/target/AssemblyError.kt b/codeGeneration/src/prog8/compiler/target/AssemblyError.kt index 236cfecad..b3c5a92fd 100644 --- a/codeGeneration/src/prog8/compiler/target/AssemblyError.kt +++ b/codeGeneration/src/prog8/compiler/target/AssemblyError.kt @@ -1,3 +1,3 @@ -package prog8.compiler.target +package prog8.codegen.target class AssemblyError(msg: String) : RuntimeException(msg) diff --git a/codeGeneration/src/prog8/compiler/target/C64Target.kt b/codeGeneration/src/prog8/compiler/target/C64Target.kt index d620ea429..952884b25 100644 --- a/codeGeneration/src/prog8/compiler/target/C64Target.kt +++ b/codeGeneration/src/prog8/compiler/target/C64Target.kt @@ -1,14 +1,14 @@ -package prog8.compiler.target +package prog8.codegen.target import com.github.michaelbull.result.fold import prog8.ast.base.* import prog8.ast.expressions.Expression import prog8.ast.statements.RegisterOrStatusflag import prog8.ast.statements.Subroutine -import prog8.compiler.target.c64.C64MachineDefinition -import prog8.compiler.target.cbm.Petscii -import prog8.compiler.target.cpu6502.codegen.asmsub6502ArgsEvalOrder -import prog8.compiler.target.cpu6502.codegen.asmsub6502ArgsHaveRegisterClobberRisk +import prog8.codegen.target.c64.C64MachineDefinition +import prog8.codegen.target.cbm.Petscii +import prog8.codegen.target.cpu6502.codegen.asmsub6502ArgsEvalOrder +import prog8.codegen.target.cpu6502.codegen.asmsub6502ArgsHaveRegisterClobberRisk import prog8.compilerinterface.ICompilationTarget diff --git a/codeGeneration/src/prog8/compiler/target/Cx16Target.kt b/codeGeneration/src/prog8/compiler/target/Cx16Target.kt index bab177096..357323516 100644 --- a/codeGeneration/src/prog8/compiler/target/Cx16Target.kt +++ b/codeGeneration/src/prog8/compiler/target/Cx16Target.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target +package prog8.codegen.target import com.github.michaelbull.result.fold import prog8.ast.base.ByteDatatypes @@ -8,10 +8,10 @@ import prog8.ast.base.WordDatatypes import prog8.ast.expressions.Expression import prog8.ast.statements.RegisterOrStatusflag import prog8.ast.statements.Subroutine -import prog8.compiler.target.cbm.Petscii -import prog8.compiler.target.cpu6502.codegen.asmsub6502ArgsEvalOrder -import prog8.compiler.target.cpu6502.codegen.asmsub6502ArgsHaveRegisterClobberRisk -import prog8.compiler.target.cx16.CX16MachineDefinition +import prog8.codegen.target.cbm.Petscii +import prog8.codegen.target.cpu6502.codegen.asmsub6502ArgsEvalOrder +import prog8.codegen.target.cpu6502.codegen.asmsub6502ArgsHaveRegisterClobberRisk +import prog8.codegen.target.cx16.CX16MachineDefinition import prog8.compilerinterface.ICompilationTarget diff --git a/codeGeneration/src/prog8/compiler/target/c64/C64MachineDefinition.kt b/codeGeneration/src/prog8/compiler/target/c64/C64MachineDefinition.kt index 91b136de7..852eabc64 100644 --- a/codeGeneration/src/prog8/compiler/target/c64/C64MachineDefinition.kt +++ b/codeGeneration/src/prog8/compiler/target/c64/C64MachineDefinition.kt @@ -1,8 +1,8 @@ -package prog8.compiler.target.c64 +package prog8.codegen.target.c64 import prog8.ast.base.DataType -import prog8.compiler.target.cbm.Mflpt5 -import prog8.compiler.target.cbm.viceMonListPostfix +import prog8.codegen.target.cbm.Mflpt5 +import prog8.codegen.target.cbm.viceMonListPostfix import prog8.compilerinterface.* import java.io.IOException import java.nio.file.Path diff --git a/codeGeneration/src/prog8/compiler/target/c64/C64Zeropage.kt b/codeGeneration/src/prog8/compiler/target/c64/C64Zeropage.kt index d0f64812f..321e61725 100644 --- a/codeGeneration/src/prog8/compiler/target/c64/C64Zeropage.kt +++ b/codeGeneration/src/prog8/compiler/target/c64/C64Zeropage.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.c64 +package prog8.codegen.target.c64 import prog8.compilerinterface.CompilationOptions import prog8.compilerinterface.InternalCompilerException diff --git a/codeGeneration/src/prog8/compiler/target/cbm/AssemblyProgram.kt b/codeGeneration/src/prog8/compiler/target/cbm/AssemblyProgram.kt index 01256b881..4d15f2e77 100644 --- a/codeGeneration/src/prog8/compiler/target/cbm/AssemblyProgram.kt +++ b/codeGeneration/src/prog8/compiler/target/cbm/AssemblyProgram.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cbm +package prog8.codegen.target.cbm import com.github.michaelbull.result.Ok import com.github.michaelbull.result.Result diff --git a/codeGeneration/src/prog8/compiler/target/cbm/Mflpt5.kt b/codeGeneration/src/prog8/compiler/target/cbm/Mflpt5.kt index 7b830a1a0..23750053f 100644 --- a/codeGeneration/src/prog8/compiler/target/cbm/Mflpt5.kt +++ b/codeGeneration/src/prog8/compiler/target/cbm/Mflpt5.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cbm +package prog8.codegen.target.cbm import prog8.compilerinterface.IMachineFloat import prog8.compilerinterface.InternalCompilerException diff --git a/codeGeneration/src/prog8/compiler/target/cbm/Petscii.kt b/codeGeneration/src/prog8/compiler/target/cbm/Petscii.kt index 07ad45b02..c07474198 100644 --- a/codeGeneration/src/prog8/compiler/target/cbm/Petscii.kt +++ b/codeGeneration/src/prog8/compiler/target/cbm/Petscii.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cbm +package prog8.codegen.target.cbm import com.github.michaelbull.result.Err import com.github.michaelbull.result.Ok diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt index ff431a76e..fcf751679 100644 --- a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt +++ b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cpu6502.codegen +package prog8.codegen.target.cpu6502.codegen import com.github.michaelbull.result.fold import prog8.ast.* @@ -6,17 +6,17 @@ import prog8.ast.antlr.escape import prog8.ast.base.* import prog8.ast.expressions.* import prog8.ast.statements.* -import prog8.compiler.target.AssemblyError -import prog8.compiler.target.C64Target -import prog8.compiler.target.Cx16Target -import prog8.compiler.target.cbm.AssemblyProgram -import prog8.compiler.target.cbm.loadAsmIncludeFile -import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignSource -import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignTarget -import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignment -import prog8.compiler.target.cpu6502.codegen.assignment.AssignmentAsmGen -import prog8.compiler.target.cpu6502.codegen.assignment.SourceStorageKind -import prog8.compiler.target.cpu6502.codegen.assignment.TargetStorageKind +import prog8.codegen.target.AssemblyError +import prog8.codegen.target.C64Target +import prog8.codegen.target.Cx16Target +import prog8.codegen.target.cbm.AssemblyProgram +import prog8.codegen.target.cbm.loadAsmIncludeFile +import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignSource +import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignTarget +import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignment +import prog8.codegen.target.cpu6502.codegen.assignment.AssignmentAsmGen +import prog8.codegen.target.cpu6502.codegen.assignment.SourceStorageKind +import prog8.codegen.target.cpu6502.codegen.assignment.TargetStorageKind import prog8.compilerinterface.* import prog8.parser.SourceCode import java.nio.file.Path diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmOptimizer.kt b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmOptimizer.kt index 2abfe0834..ce940de6d 100644 --- a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmOptimizer.kt +++ b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmOptimizer.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cpu6502.codegen +package prog8.codegen.target.cpu6502.codegen import prog8.ast.Program import prog8.ast.base.VarDeclType diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmsubHelpers.kt b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmsubHelpers.kt index 74117b523..202588248 100644 --- a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmsubHelpers.kt +++ b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmsubHelpers.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cpu6502.codegen +package prog8.codegen.target.cpu6502.codegen import prog8.ast.base.Cx16VirtualRegisters import prog8.ast.base.RegisterOrPair diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt index 14536cf4f..6297ec8cd 100644 --- a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt +++ b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cpu6502.codegen +package prog8.codegen.target.cpu6502.codegen import prog8.ast.IFunctionCall import prog8.ast.Node @@ -10,9 +10,9 @@ import prog8.ast.statements.DirectMemoryWrite import prog8.ast.statements.FunctionCallStatement import prog8.ast.statements.Subroutine import prog8.ast.toHex -import prog8.compiler.target.AssemblyError -import prog8.compiler.target.Cx16Target -import prog8.compiler.target.cpu6502.codegen.assignment.* +import prog8.codegen.target.AssemblyError +import prog8.codegen.target.Cx16Target +import prog8.codegen.target.cpu6502.codegen.assignment.* import prog8.compilerinterface.CpuType import prog8.compilerinterface.FSignature import prog8.compilerinterface.subroutineFloatEvalResultVar2 diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ExpressionsAsmGen.kt b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ExpressionsAsmGen.kt index 34a664f33..172e59009 100644 --- a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ExpressionsAsmGen.kt +++ b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ExpressionsAsmGen.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cpu6502.codegen +package prog8.codegen.target.cpu6502.codegen import prog8.ast.Program import prog8.ast.base.* @@ -6,7 +6,7 @@ import prog8.ast.expressions.* import prog8.ast.statements.BuiltinFunctionPlaceholder import prog8.ast.statements.Subroutine import prog8.ast.toHex -import prog8.compiler.target.AssemblyError +import prog8.codegen.target.AssemblyError import prog8.compilerinterface.BuiltinFunctions import prog8.compilerinterface.CpuType import kotlin.math.absoluteValue diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ForLoopsAsmGen.kt b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ForLoopsAsmGen.kt index 2146bd11b..ea357b49a 100644 --- a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ForLoopsAsmGen.kt +++ b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ForLoopsAsmGen.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cpu6502.codegen +package prog8.codegen.target.cpu6502.codegen import prog8.ast.Program import prog8.ast.base.ArrayToElementTypes @@ -8,7 +8,7 @@ import prog8.ast.expressions.IdentifierReference import prog8.ast.expressions.RangeExpr import prog8.ast.statements.ForLoop import prog8.ast.toHex -import prog8.compiler.target.AssemblyError +import prog8.codegen.target.AssemblyError import prog8.compilerinterface.toConstantIntegerRange import kotlin.math.absoluteValue diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/FunctionCallAsmGen.kt b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/FunctionCallAsmGen.kt index a9e466170..2b17e103f 100644 --- a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/FunctionCallAsmGen.kt +++ b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/FunctionCallAsmGen.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cpu6502.codegen +package prog8.codegen.target.cpu6502.codegen import prog8.ast.IFunctionCall import prog8.ast.Node @@ -6,11 +6,11 @@ import prog8.ast.Program import prog8.ast.base.* import prog8.ast.expressions.* import prog8.ast.statements.* -import prog8.compiler.target.AssemblyError -import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignSource -import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignTarget -import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignment -import prog8.compiler.target.cpu6502.codegen.assignment.TargetStorageKind +import prog8.codegen.target.AssemblyError +import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignSource +import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignTarget +import prog8.codegen.target.cpu6502.codegen.assignment.AsmAssignment +import prog8.codegen.target.cpu6502.codegen.assignment.TargetStorageKind import prog8.compilerinterface.CpuType diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/PostIncrDecrAsmGen.kt b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/PostIncrDecrAsmGen.kt index e156c5869..4a2fa3ed0 100644 --- a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/PostIncrDecrAsmGen.kt +++ b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/PostIncrDecrAsmGen.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cpu6502.codegen +package prog8.codegen.target.cpu6502.codegen import prog8.ast.Program import prog8.ast.base.* @@ -6,7 +6,7 @@ import prog8.ast.expressions.IdentifierReference import prog8.ast.expressions.NumericLiteralValue import prog8.ast.statements.PostIncrDecr import prog8.ast.toHex -import prog8.compiler.target.AssemblyError +import prog8.codegen.target.AssemblyError internal class PostIncrDecrAsmGen(private val program: Program, private val asmgen: AsmGen) { diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AsmAssignment.kt b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AsmAssignment.kt index f314ec38d..a245da8d5 100644 --- a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AsmAssignment.kt +++ b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AsmAssignment.kt @@ -1,12 +1,12 @@ -package prog8.compiler.target.cpu6502.codegen.assignment +package prog8.codegen.target.cpu6502.codegen.assignment import prog8.ast.Program import prog8.ast.base.* import prog8.ast.expressions.* import prog8.ast.statements.* import prog8.compilerinterface.IMemSizer -import prog8.compiler.target.AssemblyError -import prog8.compiler.target.cpu6502.codegen.AsmGen +import prog8.codegen.target.AssemblyError +import prog8.codegen.target.cpu6502.codegen.AsmGen internal enum class TargetStorageKind { diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AssignmentAsmGen.kt b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AssignmentAsmGen.kt index 27aaf1b76..9aa840c7e 100644 --- a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AssignmentAsmGen.kt +++ b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AssignmentAsmGen.kt @@ -1,12 +1,12 @@ -package prog8.compiler.target.cpu6502.codegen.assignment +package prog8.codegen.target.cpu6502.codegen.assignment import prog8.ast.Program import prog8.ast.base.* import prog8.ast.expressions.* import prog8.ast.statements.* import prog8.ast.toHex -import prog8.compiler.target.AssemblyError -import prog8.compiler.target.cpu6502.codegen.AsmGen +import prog8.codegen.target.AssemblyError +import prog8.codegen.target.cpu6502.codegen.AsmGen import prog8.compilerinterface.BuiltinFunctions import prog8.compilerinterface.CpuType import prog8.compilerinterface.builtinFunctionReturnType diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AugmentableAssignmentAsmGen.kt b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AugmentableAssignmentAsmGen.kt index e20e0b9ce..a7a2c8eb5 100644 --- a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AugmentableAssignmentAsmGen.kt +++ b/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AugmentableAssignmentAsmGen.kt @@ -1,12 +1,12 @@ -package prog8.compiler.target.cpu6502.codegen.assignment +package prog8.codegen.target.cpu6502.codegen.assignment import prog8.ast.Program import prog8.ast.base.* import prog8.ast.expressions.* import prog8.ast.statements.Subroutine import prog8.ast.toHex -import prog8.compiler.target.AssemblyError -import prog8.compiler.target.cpu6502.codegen.AsmGen +import prog8.codegen.target.AssemblyError +import prog8.codegen.target.cpu6502.codegen.AsmGen import prog8.compilerinterface.CpuType diff --git a/codeGeneration/src/prog8/compiler/target/cx16/CX16MachineDefinition.kt b/codeGeneration/src/prog8/compiler/target/cx16/CX16MachineDefinition.kt index d9e512d80..0144895e2 100644 --- a/codeGeneration/src/prog8/compiler/target/cx16/CX16MachineDefinition.kt +++ b/codeGeneration/src/prog8/compiler/target/cx16/CX16MachineDefinition.kt @@ -1,8 +1,8 @@ -package prog8.compiler.target.cx16 +package prog8.codegen.target.cx16 import prog8.ast.base.DataType -import prog8.compiler.target.cbm.Mflpt5 -import prog8.compiler.target.cbm.viceMonListPostfix +import prog8.codegen.target.cbm.Mflpt5 +import prog8.codegen.target.cbm.viceMonListPostfix import prog8.compilerinterface.* import java.io.IOException import java.nio.file.Path diff --git a/codeGeneration/src/prog8/compiler/target/cx16/CX16Zeropage.kt b/codeGeneration/src/prog8/compiler/target/cx16/CX16Zeropage.kt index bfa7181a3..3224ef34f 100644 --- a/codeGeneration/src/prog8/compiler/target/cx16/CX16Zeropage.kt +++ b/codeGeneration/src/prog8/compiler/target/cx16/CX16Zeropage.kt @@ -1,4 +1,4 @@ -package prog8.compiler.target.cx16 +package prog8.codegen.target.cx16 import prog8.compilerinterface.CompilationOptions import prog8.compilerinterface.InternalCompilerException