Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-01-11 13:29:45 +00:00
Code Issues Projects Releases Wiki Activity

cleanup imports

Browse Source
This commit is contained in:
Irmen de Jong 2021-10-29 05:28:02 +02:00
parent 0b5ddcdc9b
commit a226b82d0b
22 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codeGeneration/src/prog8/compiler/target/C64Target.kt
View File

@ -7,7 +7,7 @@ import prog8.ast.base.PassByReferenceDatatypes
import prog8.ast.base.WordDatatypes import prog8.ast.base.WordDatatypes
import prog8.compiler.target.c64.C64MachineDefinition import prog8.compiler.target.c64.C64MachineDefinition
import prog8.compiler.target.cbm.Petscii import prog8.compiler.target.cbm.Petscii
import prog8.compilerinterface.* import prog8.compilerinterface.ICompilationTarget
object C64Target: ICompilationTarget { object C64Target: ICompilationTarget {

2
codeGeneration/src/prog8/compiler/target/Cx16Target.kt
View File

@ -7,7 +7,7 @@ import prog8.ast.base.PassByReferenceDatatypes
import prog8.ast.base.WordDatatypes import prog8.ast.base.WordDatatypes
import prog8.compiler.target.cbm.Petscii import prog8.compiler.target.cbm.Petscii
import prog8.compiler.target.cx16.CX16MachineDefinition import prog8.compiler.target.cx16.CX16MachineDefinition
import prog8.compilerinterface.* import prog8.compilerinterface.ICompilationTarget
object Cx16Target: ICompilationTarget { object Cx16Target: ICompilationTarget {

5
codeGeneration/src/prog8/compiler/target/cpu6502/codegen/AsmGen.kt
View File

@ -6,8 +6,9 @@ import prog8.ast.antlr.escape
import prog8.ast.base.* import prog8.ast.base.*
import prog8.ast.expressions.* import prog8.ast.expressions.*
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.compiler.* import prog8.compiler.target.AssemblyError
import prog8.compiler.target.* import prog8.compiler.target.C64Target
import prog8.compiler.target.Cx16Target
import prog8.compiler.target.cbm.AssemblyProgram import prog8.compiler.target.cbm.AssemblyProgram
import prog8.compiler.target.cbm.loadAsmIncludeFile import prog8.compiler.target.cbm.loadAsmIncludeFile
import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignment import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignment

2
codeGeneration/src/prog8/compiler/target/cpu6502/codegen/BuiltinFunctionsAsmGen.kt
View File

@ -10,10 +10,10 @@ import prog8.ast.statements.DirectMemoryWrite
import prog8.ast.statements.FunctionCallStatement import prog8.ast.statements.FunctionCallStatement
import prog8.ast.statements.Subroutine import prog8.ast.statements.Subroutine
import prog8.ast.toHex import prog8.ast.toHex
import prog8.compilerinterface.CpuType
import prog8.compiler.target.AssemblyError import prog8.compiler.target.AssemblyError
import prog8.compiler.target.Cx16Target import prog8.compiler.target.Cx16Target
import prog8.compiler.target.cpu6502.codegen.assignment.* import prog8.compiler.target.cpu6502.codegen.assignment.*
import prog8.compilerinterface.CpuType
import prog8.compilerinterface.FSignature import prog8.compilerinterface.FSignature
import prog8.compilerinterface.subroutineFloatEvalResultVar2 import prog8.compilerinterface.subroutineFloatEvalResultVar2

2
codeGeneration/src/prog8/compiler/target/cpu6502/codegen/ExpressionsAsmGen.kt
View File

@ -7,9 +7,9 @@ import prog8.ast.statements.ArrayIndex
import prog8.ast.statements.BuiltinFunctionStatementPlaceholder import prog8.ast.statements.BuiltinFunctionStatementPlaceholder
import prog8.ast.statements.Subroutine import prog8.ast.statements.Subroutine
import prog8.ast.toHex import prog8.ast.toHex
import prog8.compilerinterface.CpuType
import prog8.compiler.target.AssemblyError import prog8.compiler.target.AssemblyError
import prog8.compilerinterface.BuiltinFunctions import prog8.compilerinterface.BuiltinFunctions
import prog8.compilerinterface.CpuType
import prog8.compilerinterface.subroutineFloatEvalResultVar1 import prog8.compilerinterface.subroutineFloatEvalResultVar1
import kotlin.math.absoluteValue import kotlin.math.absoluteValue

2
codeGeneration/src/prog8/compiler/target/cpu6502/codegen/FunctionCallAsmGen.kt
View File

@ -10,11 +10,11 @@ import prog8.ast.statements.RegisterOrStatusflag
import prog8.ast.statements.Subroutine import prog8.ast.statements.Subroutine
import prog8.ast.statements.SubroutineParameter import prog8.ast.statements.SubroutineParameter
import prog8.compiler.target.AssemblyError import prog8.compiler.target.AssemblyError
import prog8.compilerinterface.CpuType
import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignSource import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignSource
import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignTarget import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignTarget
import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignment import prog8.compiler.target.cpu6502.codegen.assignment.AsmAssignment
import prog8.compiler.target.cpu6502.codegen.assignment.TargetStorageKind import prog8.compiler.target.cpu6502.codegen.assignment.TargetStorageKind
import prog8.compilerinterface.CpuType
internal class FunctionCallAsmGen(private val program: Program, private val asmgen: AsmGen) { internal class FunctionCallAsmGen(private val program: Program, private val asmgen: AsmGen) {

2
codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AssignmentAsmGen.kt
View File

@ -6,10 +6,10 @@ import prog8.ast.expressions.*
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.ast.toHex import prog8.ast.toHex
import prog8.compiler.target.AssemblyError import prog8.compiler.target.AssemblyError
import prog8.compilerinterface.CpuType
import prog8.compiler.target.cpu6502.codegen.AsmGen import prog8.compiler.target.cpu6502.codegen.AsmGen
import prog8.compiler.target.cpu6502.codegen.ExpressionsAsmGen import prog8.compiler.target.cpu6502.codegen.ExpressionsAsmGen
import prog8.compilerinterface.BuiltinFunctions import prog8.compilerinterface.BuiltinFunctions
import prog8.compilerinterface.CpuType
import prog8.compilerinterface.builtinFunctionReturnType import prog8.compilerinterface.builtinFunctionReturnType

2
codeGeneration/src/prog8/compiler/target/cpu6502/codegen/assignment/AugmentableAssignmentAsmGen.kt
View File

@ -6,9 +6,9 @@ import prog8.ast.expressions.*
import prog8.ast.statements.Subroutine import prog8.ast.statements.Subroutine
import prog8.ast.toHex import prog8.ast.toHex
import prog8.compiler.target.AssemblyError import prog8.compiler.target.AssemblyError
import prog8.compilerinterface.CpuType
import prog8.compiler.target.cpu6502.codegen.AsmGen import prog8.compiler.target.cpu6502.codegen.AsmGen
import prog8.compiler.target.cpu6502.codegen.ExpressionsAsmGen import prog8.compiler.target.cpu6502.codegen.ExpressionsAsmGen
import prog8.compilerinterface.CpuType
internal class AugmentableAssignmentAsmGen(private val program: Program, internal class AugmentableAssignmentAsmGen(private val program: Program,
private val assignmentAsmGen: AssignmentAsmGen, private val assignmentAsmGen: AssignmentAsmGen,

1
codeGeneration/src/prog8/compiler/target/cx16/CX16MachineDefinition.kt
View File

@ -1,6 +1,5 @@
package prog8.compiler.target.cx16 package prog8.compiler.target.cx16
import prog8.compiler.*
import prog8.compiler.target.c64.C64MachineDefinition import prog8.compiler.target.c64.C64MachineDefinition
import prog8.compiler.target.cbm.viceMonListPostfix import prog8.compiler.target.cbm.viceMonListPostfix
import prog8.compilerinterface.* import prog8.compilerinterface.*

3
codeGeneration/test/TestCodeGeneration.kt
View File

@ -3,9 +3,6 @@ package prog8tests
import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.TestInstance
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertTrue
import kotlin.test.fail import kotlin.test.fail

3
codeOptimizers/test/TestOptimizers.kt
View File

@ -3,9 +3,6 @@ package prog8tests
import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.TestInstance
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertTrue
import kotlin.test.fail import kotlin.test.fail

5
compiler/src/prog8/compiler/astprocessing/AstExtensions.kt
View File

@ -3,11 +3,12 @@ package prog8.compiler.astprocessing
import prog8.ast.Node import prog8.ast.Node
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.DataType import prog8.ast.base.DataType
import prog8.ast.expressions.* import prog8.ast.expressions.CharLiteral
import prog8.ast.expressions.IdentifierReference
import prog8.ast.expressions.NumericLiteralValue
import prog8.ast.statements.Directive import prog8.ast.statements.Directive
import prog8.ast.walk.AstWalker import prog8.ast.walk.AstWalker
import prog8.ast.walk.IAstModification import prog8.ast.walk.IAstModification
import prog8.compiler.*
import prog8.compiler.BeforeAsmGenerationAstChanger import prog8.compiler.BeforeAsmGenerationAstChanger
import prog8.compilerinterface.CompilationOptions import prog8.compilerinterface.CompilationOptions
import prog8.compilerinterface.ICompilationTarget import prog8.compilerinterface.ICompilationTarget

4
compiler/test/ModuleImporterTests.kt
View File

@ -9,12 +9,12 @@ import org.hamcrest.core.Is
import org.junit.jupiter.api.* import org.junit.jupiter.api.*
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.internedStringsModuleName import prog8.ast.internedStringsModuleName
import prog8.compilerinterface.IErrorReporter
import prog8.compiler.ModuleImporter import prog8.compiler.ModuleImporter
import prog8.compilerinterface.IErrorReporter
import prog8.parser.ParseError import prog8.parser.ParseError
import prog8.parser.SourceCode import prog8.parser.SourceCode
import prog8tests.ast.helpers.* import prog8tests.ast.helpers.*
import prog8tests.helpers.* import prog8tests.helpers.ErrorReporterForTests
import kotlin.io.path.* import kotlin.io.path.*
import kotlin.test.assertContains import kotlin.test.assertContains
import kotlin.test.assertFailsWith import kotlin.test.assertFailsWith

4
compiler/test/TestCompilerOnExamples.kt
View File

@ -4,15 +4,15 @@ import org.junit.jupiter.api.DynamicTest
import org.junit.jupiter.api.DynamicTest.dynamicTest import org.junit.jupiter.api.DynamicTest.dynamicTest
import org.junit.jupiter.api.TestFactory import org.junit.jupiter.api.TestFactory
import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.TestInstance
import prog8.compilerinterface.ICompilationTarget
import prog8.compiler.compileProgram import prog8.compiler.compileProgram
import prog8.compiler.target.C64Target import prog8.compiler.target.C64Target
import prog8.compiler.target.Cx16Target import prog8.compiler.target.Cx16Target
import prog8.compilerinterface.ICompilationTarget
import prog8tests.ast.helpers.assumeDirectory import prog8tests.ast.helpers.assumeDirectory
import prog8tests.ast.helpers.mapCombinations import prog8tests.ast.helpers.mapCombinations
import prog8tests.ast.helpers.outputDir import prog8tests.ast.helpers.outputDir
import prog8tests.ast.helpers.workingDir import prog8tests.ast.helpers.workingDir
import prog8tests.helpers.* import prog8tests.helpers.assertSuccess
import kotlin.io.path.absolute import kotlin.io.path.absolute
import kotlin.io.path.exists import kotlin.io.path.exists

4
compiler/test/TestCompilerOnImportsAndIncludes.kt
View File

@ -9,7 +9,9 @@ import prog8.ast.statements.FunctionCallStatement
import prog8.ast.statements.Label import prog8.ast.statements.Label
import prog8.compiler.target.Cx16Target import prog8.compiler.target.Cx16Target
import prog8tests.ast.helpers.* import prog8tests.ast.helpers.*
import prog8tests.helpers.* import prog8tests.helpers.assertFailure
import prog8tests.helpers.assertSuccess
import prog8tests.helpers.compileFile
import kotlin.io.path.name import kotlin.io.path.name
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertNotEquals import kotlin.test.assertNotEquals

7
compiler/test/TestCompilerOnRanges.kt
View File

@ -9,12 +9,15 @@ import prog8.ast.expressions.*
import prog8.ast.statements.ForLoop import prog8.ast.statements.ForLoop
import prog8.ast.statements.Subroutine import prog8.ast.statements.Subroutine
import prog8.ast.statements.VarDecl import prog8.ast.statements.VarDecl
import prog8.compilerinterface.size
import prog8.compiler.target.C64Target import prog8.compiler.target.C64Target
import prog8.compiler.target.Cx16Target import prog8.compiler.target.Cx16Target
import prog8.compilerinterface.size
import prog8.compilerinterface.toConstantIntegerRange import prog8.compilerinterface.toConstantIntegerRange
import prog8tests.ast.helpers.mapCombinations import prog8tests.ast.helpers.mapCombinations
import prog8tests.helpers.* import prog8tests.helpers.ErrorReporterForTests
import prog8tests.helpers.assertFailure
import prog8tests.helpers.assertSuccess
import prog8tests.helpers.compileText
import kotlin.test.assertContains import kotlin.test.assertContains
import kotlin.test.assertEquals import kotlin.test.assertEquals

2
compiler/test/TestCompilerOptionLibdirs.kt
View File

@ -10,7 +10,7 @@ import prog8tests.ast.helpers.assumeReadableFile
import prog8tests.ast.helpers.fixturesDir import prog8tests.ast.helpers.fixturesDir
import prog8tests.ast.helpers.outputDir import prog8tests.ast.helpers.outputDir
import prog8tests.ast.helpers.workingDir import prog8tests.ast.helpers.workingDir
import prog8tests.helpers.* import prog8tests.helpers.assertSuccess
import java.nio.file.Path import java.nio.file.Path
import kotlin.io.path.absolute import kotlin.io.path.absolute
import kotlin.io.path.createTempFile import kotlin.io.path.createTempFile

2
compiler/test/TestImportedModulesOrderAndOptions.kt
View File

@ -3,11 +3,11 @@ package prog8tests
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.TestInstance
import prog8.ast.internedStringsModuleName import prog8.ast.internedStringsModuleName
import prog8.compilerinterface.ZeropageType
import prog8.compiler.determineCompilationOptions import prog8.compiler.determineCompilationOptions
import prog8.compiler.parseImports import prog8.compiler.parseImports
import prog8.compiler.target.C64Target import prog8.compiler.target.C64Target
import prog8.compilerinterface.ErrorReporter import prog8.compilerinterface.ErrorReporter
import prog8.compilerinterface.ZeropageType
import prog8tests.ast.helpers.outputDir import prog8tests.ast.helpers.outputDir
import prog8tests.helpers.assertSuccess import prog8tests.helpers.assertSuccess
import prog8tests.helpers.compileText import prog8tests.helpers.compileText

2
compiler/test/TestMemory.kt
View File

@ -12,8 +12,8 @@ import prog8.ast.expressions.IdentifierReference
import prog8.ast.expressions.NumericLiteralValue import prog8.ast.expressions.NumericLiteralValue
import prog8.ast.expressions.PrefixExpression import prog8.ast.expressions.PrefixExpression
import prog8.ast.statements.* import prog8.ast.statements.*
import prog8.compilerinterface.isInRegularRAMof
import prog8.compiler.target.C64Target import prog8.compiler.target.C64Target
import prog8.compilerinterface.isInRegularRAMof
import prog8.parser.SourceCode import prog8.parser.SourceCode
import prog8tests.ast.helpers.DummyFunctions import prog8tests.ast.helpers.DummyFunctions
import prog8tests.ast.helpers.DummyMemsizer import prog8tests.ast.helpers.DummyMemsizer

2
compiler/test/TestNumbers.kt
View File

@ -6,10 +6,10 @@ import org.hamcrest.Matchers.equalTo
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.TestInstance
import prog8.ast.toHex import prog8.ast.toHex
import prog8.compilerinterface.CompilerException
import prog8.compiler.target.c64.C64MachineDefinition.FLOAT_MAX_NEGATIVE import prog8.compiler.target.c64.C64MachineDefinition.FLOAT_MAX_NEGATIVE
import prog8.compiler.target.c64.C64MachineDefinition.FLOAT_MAX_POSITIVE import prog8.compiler.target.c64.C64MachineDefinition.FLOAT_MAX_POSITIVE
import prog8.compiler.target.c64.C64MachineDefinition.Mflpt5 import prog8.compiler.target.c64.C64MachineDefinition.Mflpt5
import prog8.compilerinterface.CompilerException
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertFailsWith import kotlin.test.assertFailsWith

3
compiler/test/helpers/compileXyz.kt
View File

@ -1,6 +1,7 @@
package prog8tests.helpers package prog8tests.helpers
import prog8.compiler.* import prog8.compiler.CompilationResult
import prog8.compiler.compileProgram
import prog8.compilerinterface.ErrorReporter import prog8.compilerinterface.ErrorReporter
import prog8.compilerinterface.ICompilationTarget import prog8.compilerinterface.ICompilationTarget
import prog8.compilerinterface.IErrorReporter import prog8.compilerinterface.IErrorReporter

3
compilerInterfaces/test/TestAstExtensions.kt
View File

@ -5,7 +5,8 @@ import org.junit.jupiter.api.TestInstance
import prog8.ast.base.Position import prog8.ast.base.Position
import prog8.ast.expressions.NumericLiteralValue import prog8.ast.expressions.NumericLiteralValue
import prog8.ast.expressions.RangeExpr import prog8.ast.expressions.RangeExpr
import prog8.compilerinterface.* import prog8.compilerinterface.IStringEncoding
import prog8.compilerinterface.size
import kotlin.test.assertEquals import kotlin.test.assertEquals