From b799f2e05b2af98e0dc74287d49cf39adbca2191 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Tue, 28 Dec 2021 14:18:04 +0100 Subject: [PATCH 1/2] 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 From 0feeb88024cc4ad86b574e4963454cb5b2d50cd9 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Tue, 28 Dec 2021 14:23:36 +0100 Subject: [PATCH 2/2] codegen package rename 2 --- .../prog8/{compiler => codegen}/target/AssemblyError.kt | 0 .../src/prog8/{compiler => codegen}/target/C64Target.kt | 0 .../src/prog8/{compiler => codegen}/target/Cx16Target.kt | 0 .../target/c64/C64MachineDefinition.kt | 0 .../prog8/{compiler => codegen}/target/c64/C64Zeropage.kt | 0 .../{compiler => codegen}/target/cbm/AssemblyProgram.kt | 0 .../src/prog8/{compiler => codegen}/target/cbm/Mflpt5.kt | 0 .../src/prog8/{compiler => codegen}/target/cbm/Petscii.kt | 0 .../target/cpu6502/codegen/AsmGen.kt | 0 .../target/cpu6502/codegen/AsmOptimizer.kt | 0 .../target/cpu6502/codegen/AsmsubHelpers.kt | 0 .../target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt | 0 .../target/cpu6502/codegen/ExpressionsAsmGen.kt | 0 .../target/cpu6502/codegen/ForLoopsAsmGen.kt | 0 .../target/cpu6502/codegen/FunctionCallAsmGen.kt | 0 .../target/cpu6502/codegen/PostIncrDecrAsmGen.kt | 0 .../target/cpu6502/codegen/assignment/AsmAssignment.kt | 0 .../target/cpu6502/codegen/assignment/AssignmentAsmGen.kt | 0 .../codegen/assignment/AugmentableAssignmentAsmGen.kt | 0 .../target/cx16/CX16MachineDefinition.kt | 0 .../{compiler => codegen}/target/cx16/CX16Zeropage.kt | 0 compiler/src/prog8/CompilerMain.kt | 4 ++-- .../src/prog8/compiler/BeforeAsmGenerationAstChanger.kt | 2 +- compiler/src/prog8/compiler/Compiler.kt | 6 +++--- compiler/test/TestAstChecks.kt | 2 +- compiler/test/TestCallgraph.kt | 2 +- compiler/test/TestCompilerOnCharLit.kt | 2 +- compiler/test/TestCompilerOnExamples.kt | 4 ++-- compiler/test/TestCompilerOnImportsAndIncludes.kt | 2 +- compiler/test/TestCompilerOnRanges.kt | 4 ++-- compiler/test/TestCompilerOptionLibdirs.kt | 2 +- compiler/test/TestImportedModulesOrderAndOptions.kt | 2 +- compiler/test/TestMemory.kt | 2 +- compiler/test/TestNumbers.kt | 4 ++-- compiler/test/TestOptimization.kt | 2 +- compiler/test/TestPetscii.kt | 2 +- compiler/test/TestScoping.kt | 2 +- compiler/test/TestSubroutines.kt | 2 +- compiler/test/ZeropageTests.kt | 8 ++++---- compiler/test/ast/TestProg8Parser.kt | 4 ++-- compiler/test/codegeneration/TestAsmGenSymbols.kt | 6 +++--- compiler/test/codegeneration/TestVariables.kt | 2 +- compiler/test/helpers/compileXyz.kt | 6 +++--- 43 files changed, 36 insertions(+), 36 deletions(-) rename codeGeneration/src/prog8/{compiler => codegen}/target/AssemblyError.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/C64Target.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/Cx16Target.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/c64/C64MachineDefinition.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/c64/C64Zeropage.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cbm/AssemblyProgram.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cbm/Mflpt5.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cbm/Petscii.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cpu6502/codegen/AsmGen.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cpu6502/codegen/AsmOptimizer.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cpu6502/codegen/AsmsubHelpers.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cpu6502/codegen/ExpressionsAsmGen.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cpu6502/codegen/ForLoopsAsmGen.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cpu6502/codegen/FunctionCallAsmGen.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cpu6502/codegen/PostIncrDecrAsmGen.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cpu6502/codegen/assignment/AsmAssignment.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cpu6502/codegen/assignment/AssignmentAsmGen.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cpu6502/codegen/assignment/AugmentableAssignmentAsmGen.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cx16/CX16MachineDefinition.kt (100%) rename codeGeneration/src/prog8/{compiler => codegen}/target/cx16/CX16Zeropage.kt (100%) diff --git a/codeGeneration/src/prog8/compiler/target/AssemblyError.kt b/codeGeneration/src/prog8/codegen/target/AssemblyError.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/AssemblyError.kt rename to codeGeneration/src/prog8/codegen/target/AssemblyError.kt diff --git a/codeGeneration/src/prog8/compiler/target/C64Target.kt b/codeGeneration/src/prog8/codegen/target/C64Target.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/C64Target.kt rename to codeGeneration/src/prog8/codegen/target/C64Target.kt diff --git a/codeGeneration/src/prog8/compiler/target/Cx16Target.kt b/codeGeneration/src/prog8/codegen/target/Cx16Target.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/Cx16Target.kt rename to codeGeneration/src/prog8/codegen/target/Cx16Target.kt diff --git a/codeGeneration/src/prog8/compiler/target/c64/C64MachineDefinition.kt b/codeGeneration/src/prog8/codegen/target/c64/C64MachineDefinition.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/c64/C64MachineDefinition.kt rename to codeGeneration/src/prog8/codegen/target/c64/C64MachineDefinition.kt diff --git a/codeGeneration/src/prog8/compiler/target/c64/C64Zeropage.kt b/codeGeneration/src/prog8/codegen/target/c64/C64Zeropage.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/c64/C64Zeropage.kt rename to codeGeneration/src/prog8/codegen/target/c64/C64Zeropage.kt diff --git a/codeGeneration/src/prog8/compiler/target/cbm/AssemblyProgram.kt b/codeGeneration/src/prog8/codegen/target/cbm/AssemblyProgram.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cbm/AssemblyProgram.kt rename to codeGeneration/src/prog8/codegen/target/cbm/AssemblyProgram.kt diff --git a/codeGeneration/src/prog8/compiler/target/cbm/Mflpt5.kt b/codeGeneration/src/prog8/codegen/target/cbm/Mflpt5.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cbm/Mflpt5.kt rename to codeGeneration/src/prog8/codegen/target/cbm/Mflpt5.kt diff --git a/codeGeneration/src/prog8/compiler/target/cbm/Petscii.kt b/codeGeneration/src/prog8/codegen/target/cbm/Petscii.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cbm/Petscii.kt rename to codeGeneration/src/prog8/codegen/target/cbm/Petscii.kt diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt b/codeGeneration/src/prog8/codegen/target/cpu6502/codegen/AsmGen.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt rename to codeGeneration/src/prog8/codegen/target/cpu6502/codegen/AsmGen.kt diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmOptimizer.kt b/codeGeneration/src/prog8/codegen/target/cpu6502/codegen/AsmOptimizer.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmOptimizer.kt rename to codeGeneration/src/prog8/codegen/target/cpu6502/codegen/AsmOptimizer.kt diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmsubHelpers.kt b/codeGeneration/src/prog8/codegen/target/cpu6502/codegen/AsmsubHelpers.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmsubHelpers.kt rename to codeGeneration/src/prog8/codegen/target/cpu6502/codegen/AsmsubHelpers.kt diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt b/codeGeneration/src/prog8/codegen/target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt rename to codeGeneration/src/prog8/codegen/target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ExpressionsAsmGen.kt b/codeGeneration/src/prog8/codegen/target/cpu6502/codegen/ExpressionsAsmGen.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ExpressionsAsmGen.kt rename to codeGeneration/src/prog8/codegen/target/cpu6502/codegen/ExpressionsAsmGen.kt diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ForLoopsAsmGen.kt b/codeGeneration/src/prog8/codegen/target/cpu6502/codegen/ForLoopsAsmGen.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ForLoopsAsmGen.kt rename to codeGeneration/src/prog8/codegen/target/cpu6502/codegen/ForLoopsAsmGen.kt diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/FunctionCallAsmGen.kt b/codeGeneration/src/prog8/codegen/target/cpu6502/codegen/FunctionCallAsmGen.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cpu6502/codegen/FunctionCallAsmGen.kt rename to codeGeneration/src/prog8/codegen/target/cpu6502/codegen/FunctionCallAsmGen.kt diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/PostIncrDecrAsmGen.kt b/codeGeneration/src/prog8/codegen/target/cpu6502/codegen/PostIncrDecrAsmGen.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cpu6502/codegen/PostIncrDecrAsmGen.kt rename to codeGeneration/src/prog8/codegen/target/cpu6502/codegen/PostIncrDecrAsmGen.kt diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AsmAssignment.kt b/codeGeneration/src/prog8/codegen/target/cpu6502/codegen/assignment/AsmAssignment.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AsmAssignment.kt rename to codeGeneration/src/prog8/codegen/target/cpu6502/codegen/assignment/AsmAssignment.kt diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AssignmentAsmGen.kt b/codeGeneration/src/prog8/codegen/target/cpu6502/codegen/assignment/AssignmentAsmGen.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AssignmentAsmGen.kt rename to codeGeneration/src/prog8/codegen/target/cpu6502/codegen/assignment/AssignmentAsmGen.kt diff --git a/codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AugmentableAssignmentAsmGen.kt b/codeGeneration/src/prog8/codegen/target/cpu6502/codegen/assignment/AugmentableAssignmentAsmGen.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AugmentableAssignmentAsmGen.kt rename to codeGeneration/src/prog8/codegen/target/cpu6502/codegen/assignment/AugmentableAssignmentAsmGen.kt diff --git a/codeGeneration/src/prog8/compiler/target/cx16/CX16MachineDefinition.kt b/codeGeneration/src/prog8/codegen/target/cx16/CX16MachineDefinition.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cx16/CX16MachineDefinition.kt rename to codeGeneration/src/prog8/codegen/target/cx16/CX16MachineDefinition.kt diff --git a/codeGeneration/src/prog8/compiler/target/cx16/CX16Zeropage.kt b/codeGeneration/src/prog8/codegen/target/cx16/CX16Zeropage.kt similarity index 100% rename from codeGeneration/src/prog8/compiler/target/cx16/CX16Zeropage.kt rename to codeGeneration/src/prog8/codegen/target/cx16/CX16Zeropage.kt diff --git a/compiler/src/prog8/CompilerMain.kt b/compiler/src/prog8/CompilerMain.kt index 3d050217f..c10e46daa 100644 --- a/compiler/src/prog8/CompilerMain.kt +++ b/compiler/src/prog8/CompilerMain.kt @@ -5,8 +5,8 @@ import prog8.ast.base.AstException import prog8.compiler.CompilationResult import prog8.compiler.CompilerArguments import prog8.compiler.compileProgram -import prog8.compiler.target.C64Target -import prog8.compiler.target.Cx16Target +import prog8.codegen.target.C64Target +import prog8.codegen.target.Cx16Target import java.io.File import java.nio.file.FileSystems import java.nio.file.Path diff --git a/compiler/src/prog8/compiler/BeforeAsmGenerationAstChanger.kt b/compiler/src/prog8/compiler/BeforeAsmGenerationAstChanger.kt index 6f0f9a1cd..da3bcaf39 100644 --- a/compiler/src/prog8/compiler/BeforeAsmGenerationAstChanger.kt +++ b/compiler/src/prog8/compiler/BeforeAsmGenerationAstChanger.kt @@ -11,7 +11,7 @@ import prog8.ast.walk.AstWalker import prog8.ast.walk.IAstModification import prog8.ast.walk.IAstVisitor import prog8.compiler.astprocessing.isSubroutineParameter -import prog8.compiler.target.AssemblyError +import prog8.codegen.target.AssemblyError import prog8.compilerinterface.* import prog8.optimizer.getTempVarName diff --git a/compiler/src/prog8/compiler/Compiler.kt b/compiler/src/prog8/compiler/Compiler.kt index 783ff6dc5..07331e607 100644 --- a/compiler/src/prog8/compiler/Compiler.kt +++ b/compiler/src/prog8/compiler/Compiler.kt @@ -10,9 +10,9 @@ import prog8.ast.expressions.Expression import prog8.ast.expressions.NumericLiteralValue import prog8.ast.statements.Directive import prog8.compiler.astprocessing.* -import prog8.compiler.target.C64Target -import prog8.compiler.target.Cx16Target -import prog8.compiler.target.cpu6502.codegen.AsmGen +import prog8.codegen.target.C64Target +import prog8.codegen.target.Cx16Target +import prog8.codegen.target.cpu6502.codegen.AsmGen import prog8.compilerinterface.* import prog8.optimizer.* import prog8.parser.ParseError diff --git a/compiler/test/TestAstChecks.kt b/compiler/test/TestAstChecks.kt index 88e7ba782..dad3afbc0 100644 --- a/compiler/test/TestAstChecks.kt +++ b/compiler/test/TestAstChecks.kt @@ -3,7 +3,7 @@ package prog8tests import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain -import prog8.compiler.target.C64Target +import prog8.codegen.target.C64Target import prog8tests.helpers.ErrorReporterForTests import prog8tests.helpers.assertSuccess import prog8tests.helpers.compileText diff --git a/compiler/test/TestCallgraph.kt b/compiler/test/TestCallgraph.kt index ab5fc265d..fe62c1f7e 100644 --- a/compiler/test/TestCallgraph.kt +++ b/compiler/test/TestCallgraph.kt @@ -7,7 +7,7 @@ import io.kotest.matchers.maps.shouldNotContainKey import io.kotest.matchers.shouldBe import prog8.ast.statements.Block import prog8.ast.statements.Subroutine -import prog8.compiler.target.C64Target +import prog8.codegen.target.C64Target import prog8.compilerinterface.CallGraph import prog8tests.helpers.assertSuccess import prog8tests.helpers.compileText diff --git a/compiler/test/TestCompilerOnCharLit.kt b/compiler/test/TestCompilerOnCharLit.kt index f80f61ede..3aba5b100 100644 --- a/compiler/test/TestCompilerOnCharLit.kt +++ b/compiler/test/TestCompilerOnCharLit.kt @@ -11,7 +11,7 @@ import prog8.ast.base.VarDeclType import prog8.ast.expressions.IdentifierReference import prog8.ast.expressions.NumericLiteralValue import prog8.ast.statements.Assignment -import prog8.compiler.target.Cx16Target +import prog8.codegen.target.Cx16Target import prog8tests.helpers.assertSuccess import prog8tests.helpers.compileText diff --git a/compiler/test/TestCompilerOnExamples.kt b/compiler/test/TestCompilerOnExamples.kt index 88ae2a70e..53649587e 100644 --- a/compiler/test/TestCompilerOnExamples.kt +++ b/compiler/test/TestCompilerOnExamples.kt @@ -4,8 +4,8 @@ import io.kotest.core.spec.style.FunSpec import prog8.compiler.CompilationResult import prog8.compiler.CompilerArguments import prog8.compiler.compileProgram -import prog8.compiler.target.C64Target -import prog8.compiler.target.Cx16Target +import prog8.codegen.target.C64Target +import prog8.codegen.target.Cx16Target import prog8.compilerinterface.ICompilationTarget import prog8tests.helpers.* import prog8tests.helpers.assertSuccess diff --git a/compiler/test/TestCompilerOnImportsAndIncludes.kt b/compiler/test/TestCompilerOnImportsAndIncludes.kt index 7bf6bf7cb..cbc2f7ea8 100644 --- a/compiler/test/TestCompilerOnImportsAndIncludes.kt +++ b/compiler/test/TestCompilerOnImportsAndIncludes.kt @@ -9,7 +9,7 @@ import prog8.ast.expressions.IdentifierReference import prog8.ast.expressions.StringLiteralValue import prog8.ast.statements.FunctionCallStatement import prog8.ast.statements.Label -import prog8.compiler.target.Cx16Target +import prog8.codegen.target.Cx16Target import prog8tests.helpers.* import prog8tests.helpers.assertFailure import prog8tests.helpers.assertSuccess diff --git a/compiler/test/TestCompilerOnRanges.kt b/compiler/test/TestCompilerOnRanges.kt index 45972761b..a114ca1bc 100644 --- a/compiler/test/TestCompilerOnRanges.kt +++ b/compiler/test/TestCompilerOnRanges.kt @@ -10,8 +10,8 @@ import prog8.ast.base.Position import prog8.ast.expressions.* import prog8.ast.statements.ForLoop import prog8.ast.statements.VarDecl -import prog8.compiler.target.C64Target -import prog8.compiler.target.Cx16Target +import prog8.codegen.target.C64Target +import prog8.codegen.target.Cx16Target import prog8.compilerinterface.size import prog8.compilerinterface.toConstantIntegerRange import prog8tests.helpers.* diff --git a/compiler/test/TestCompilerOptionLibdirs.kt b/compiler/test/TestCompilerOptionLibdirs.kt index 73e404eb3..ff4647bbb 100644 --- a/compiler/test/TestCompilerOptionLibdirs.kt +++ b/compiler/test/TestCompilerOptionLibdirs.kt @@ -4,7 +4,7 @@ import io.kotest.core.spec.style.FunSpec import prog8.compiler.CompilationResult import prog8.compiler.CompilerArguments import prog8.compiler.compileProgram -import prog8.compiler.target.Cx16Target +import prog8.codegen.target.Cx16Target import prog8tests.helpers.* import prog8tests.helpers.assertSuccess import java.nio.file.Path diff --git a/compiler/test/TestImportedModulesOrderAndOptions.kt b/compiler/test/TestImportedModulesOrderAndOptions.kt index 9e5e658b5..369d03977 100644 --- a/compiler/test/TestImportedModulesOrderAndOptions.kt +++ b/compiler/test/TestImportedModulesOrderAndOptions.kt @@ -7,7 +7,7 @@ import io.kotest.matchers.string.shouldStartWith import prog8.ast.internedStringsModuleName import prog8.compiler.determineCompilationOptions import prog8.compiler.parseImports -import prog8.compiler.target.C64Target +import prog8.codegen.target.C64Target import prog8.compilerinterface.ZeropageType import prog8tests.helpers.ErrorReporterForTests import prog8tests.helpers.assertSuccess diff --git a/compiler/test/TestMemory.kt b/compiler/test/TestMemory.kt index 2a6beae1f..fa0a5d229 100644 --- a/compiler/test/TestMemory.kt +++ b/compiler/test/TestMemory.kt @@ -13,7 +13,7 @@ import prog8.ast.expressions.NumericLiteralValue import prog8.ast.expressions.PrefixExpression import prog8.ast.statements.* import prog8.compiler.printProgram -import prog8.compiler.target.C64Target +import prog8.codegen.target.C64Target import prog8.compilerinterface.isIOAddress import prog8.parser.SourceCode import prog8tests.helpers.DummyFunctions diff --git a/compiler/test/TestNumbers.kt b/compiler/test/TestNumbers.kt index 3b5d2738e..5fb92bc0f 100644 --- a/compiler/test/TestNumbers.kt +++ b/compiler/test/TestNumbers.kt @@ -6,8 +6,8 @@ import io.kotest.matchers.doubles.plusOrMinus import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain import prog8.ast.toHex -import prog8.compiler.target.C64Target -import prog8.compiler.target.cbm.Mflpt5 +import prog8.codegen.target.C64Target +import prog8.codegen.target.cbm.Mflpt5 import prog8.compilerinterface.InternalCompilerException import prog8tests.helpers.ErrorReporterForTests import prog8tests.helpers.assertFailure diff --git a/compiler/test/TestOptimization.kt b/compiler/test/TestOptimization.kt index 1737a6eaf..4b3d45ca4 100644 --- a/compiler/test/TestOptimization.kt +++ b/compiler/test/TestOptimization.kt @@ -16,7 +16,7 @@ import prog8.ast.expressions.* import prog8.ast.statements.* import prog8.compiler.BeforeAsmGenerationAstChanger import prog8.compiler.printProgram -import prog8.compiler.target.C64Target +import prog8.codegen.target.C64Target import prog8.compilerinterface.* import prog8tests.helpers.* import prog8tests.helpers.DummyFunctions diff --git a/compiler/test/TestPetscii.kt b/compiler/test/TestPetscii.kt index 6a93b3633..6279d3a1f 100644 --- a/compiler/test/TestPetscii.kt +++ b/compiler/test/TestPetscii.kt @@ -6,7 +6,7 @@ import com.github.michaelbull.result.getOrElse import io.kotest.assertions.withClue import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe -import prog8.compiler.target.cbm.Petscii +import prog8.codegen.target.cbm.Petscii class TestPetscii: FunSpec({ diff --git a/compiler/test/TestScoping.kt b/compiler/test/TestScoping.kt index 6133f535b..f792f93e5 100644 --- a/compiler/test/TestScoping.kt +++ b/compiler/test/TestScoping.kt @@ -10,7 +10,7 @@ import prog8.ast.GlobalNamespace import prog8.ast.base.ParentSentinel import prog8.ast.expressions.NumericLiteralValue import prog8.ast.statements.* -import prog8.compiler.target.C64Target +import prog8.codegen.target.C64Target import prog8tests.helpers.ErrorReporterForTests import prog8tests.helpers.assertFailure import prog8tests.helpers.assertSuccess diff --git a/compiler/test/TestSubroutines.kt b/compiler/test/TestSubroutines.kt index 2591ebb4b..020e01301 100644 --- a/compiler/test/TestSubroutines.kt +++ b/compiler/test/TestSubroutines.kt @@ -10,7 +10,7 @@ import prog8.ast.base.DataType import prog8.ast.expressions.* import prog8.ast.statements.* import prog8.compiler.printProgram -import prog8.compiler.target.C64Target +import prog8.codegen.target.C64Target import prog8tests.helpers.ErrorReporterForTests import prog8tests.helpers.assertFailure import prog8tests.helpers.assertSuccess diff --git a/compiler/test/ZeropageTests.kt b/compiler/test/ZeropageTests.kt index 87b90a24e..78c6f58a7 100644 --- a/compiler/test/ZeropageTests.kt +++ b/compiler/test/ZeropageTests.kt @@ -11,10 +11,10 @@ import prog8.ast.base.DataType import prog8.ast.expressions.Expression import prog8.ast.statements.RegisterOrStatusflag import prog8.ast.statements.Subroutine -import prog8.compiler.target.C64Target -import prog8.compiler.target.Cx16Target -import prog8.compiler.target.c64.C64Zeropage -import prog8.compiler.target.cx16.CX16Zeropage +import prog8.codegen.target.C64Target +import prog8.codegen.target.Cx16Target +import prog8.codegen.target.c64.C64Zeropage +import prog8.codegen.target.cx16.CX16Zeropage import prog8.compilerinterface.* import prog8tests.helpers.ErrorReporterForTests diff --git a/compiler/test/ast/TestProg8Parser.kt b/compiler/test/ast/TestProg8Parser.kt index df6d234e8..0a32c757a 100644 --- a/compiler/test/ast/TestProg8Parser.kt +++ b/compiler/test/ast/TestProg8Parser.kt @@ -19,8 +19,8 @@ import prog8.ast.base.DataType import prog8.ast.base.Position import prog8.ast.expressions.* import prog8.ast.statements.* -import prog8.compiler.target.C64Target -import prog8.compiler.target.cbm.Petscii +import prog8.codegen.target.C64Target +import prog8.codegen.target.cbm.Petscii import prog8.parser.ParseError import prog8.parser.Prog8Parser.parseModule import prog8.parser.SourceCode diff --git a/compiler/test/codegeneration/TestAsmGenSymbols.kt b/compiler/test/codegeneration/TestAsmGenSymbols.kt index 570d08dad..966f194fe 100644 --- a/compiler/test/codegeneration/TestAsmGenSymbols.kt +++ b/compiler/test/codegeneration/TestAsmGenSymbols.kt @@ -10,9 +10,9 @@ import prog8.ast.expressions.AddressOf import prog8.ast.expressions.IdentifierReference import prog8.ast.expressions.NumericLiteralValue import prog8.ast.statements.* -import prog8.compiler.target.C64Target -import prog8.compiler.target.c64.C64Zeropage -import prog8.compiler.target.cpu6502.codegen.AsmGen +import prog8.codegen.target.C64Target +import prog8.codegen.target.c64.C64Zeropage +import prog8.codegen.target.cpu6502.codegen.AsmGen import prog8.compilerinterface.* import prog8.parser.SourceCode import prog8tests.helpers.DummyFunctions diff --git a/compiler/test/codegeneration/TestVariables.kt b/compiler/test/codegeneration/TestVariables.kt index 80c319e25..953600c54 100644 --- a/compiler/test/codegeneration/TestVariables.kt +++ b/compiler/test/codegeneration/TestVariables.kt @@ -3,7 +3,7 @@ package prog8tests.codegeneration import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe import io.kotest.matchers.string.shouldContain -import prog8.compiler.target.C64Target +import prog8.codegen.target.C64Target import prog8tests.helpers.ErrorReporterForTests import prog8tests.helpers.assertSuccess import prog8tests.helpers.compileText diff --git a/compiler/test/helpers/compileXyz.kt b/compiler/test/helpers/compileXyz.kt index 580d6e727..6c23f261b 100644 --- a/compiler/test/helpers/compileXyz.kt +++ b/compiler/test/helpers/compileXyz.kt @@ -6,9 +6,9 @@ import prog8.ast.Program import prog8.compiler.CompilationResult import prog8.compiler.CompilerArguments import prog8.compiler.compileProgram -import prog8.compiler.target.C64Target -import prog8.compiler.target.c64.C64Zeropage -import prog8.compiler.target.cpu6502.codegen.AsmGen +import prog8.codegen.target.C64Target +import prog8.codegen.target.c64.C64Zeropage +import prog8.codegen.target.cpu6502.codegen.AsmGen import prog8.compilerinterface.* import java.nio.file.Path import kotlin.io.path.name