diff --git a/codeCore/src/prog8/code/ast/AstExpressions.kt b/codeCore/src/prog8/code/ast/AstExpressions.kt index aeaeff577..44c038ebe 100644 --- a/codeCore/src/prog8/code/ast/AstExpressions.kt +++ b/codeCore/src/prog8/code/ast/AstExpressions.kt @@ -1,6 +1,9 @@ package prog8.code.ast -import prog8.code.core.* +import prog8.code.core.DataType +import prog8.code.core.Encoding +import prog8.code.core.NumericDatatypes +import prog8.code.core.Position import java.util.* import kotlin.math.abs import kotlin.math.round diff --git a/codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AssignmentAsmGen.kt b/codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AssignmentAsmGen.kt index 8b56e594b..404dcbdf5 100644 --- a/codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AssignmentAsmGen.kt +++ b/codeGenCpu6502/src/prog8/codegen/cpu6502/assignment/AssignmentAsmGen.kt @@ -1,14 +1,11 @@ package prog8.codegen.cpu6502.assignment -import prog8.code.StStaticVariable import prog8.code.SymbolTable import prog8.code.ast.* import prog8.code.core.* import prog8.codegen.cpu6502.AsmGen6502Internal -import prog8.codegen.cpu6502.ExpressionsAsmGen import prog8.codegen.cpu6502.VariableAllocator import prog8.codegen.cpu6502.returnsWhatWhere -import java.util.* internal class AssignmentAsmGen(private val program: PtProgram, diff --git a/codeGenExperimental/src/prog8/codegen/experimental/ExperiCodeGen.kt b/codeGenExperimental/src/prog8/codegen/experimental/ExperiCodeGen.kt index 2bf4c82b6..541be861b 100644 --- a/codeGenExperimental/src/prog8/codegen/experimental/ExperiCodeGen.kt +++ b/codeGenExperimental/src/prog8/codegen/experimental/ExperiCodeGen.kt @@ -2,7 +2,10 @@ package prog8.codegen.experimental import prog8.code.SymbolTable import prog8.code.ast.PtProgram -import prog8.code.core.* +import prog8.code.core.CompilationOptions +import prog8.code.core.IAssemblyProgram +import prog8.code.core.ICodeGeneratorBackend +import prog8.code.core.IErrorReporter import prog8.codegen.intermediate.IRCodeGen import prog8.intermediate.IRFileWriter diff --git a/codeGenIntermediate/src/prog8/codegen/vm/VmCodeGen.kt b/codeGenIntermediate/src/prog8/codegen/vm/VmCodeGen.kt index 0718ae7a6..7bc6195ce 100644 --- a/codeGenIntermediate/src/prog8/codegen/vm/VmCodeGen.kt +++ b/codeGenIntermediate/src/prog8/codegen/vm/VmCodeGen.kt @@ -2,7 +2,10 @@ package prog8.codegen.vm import prog8.code.SymbolTable import prog8.code.ast.PtProgram -import prog8.code.core.* +import prog8.code.core.CompilationOptions +import prog8.code.core.IAssemblyProgram +import prog8.code.core.ICodeGeneratorBackend +import prog8.code.core.IErrorReporter import prog8.codegen.intermediate.IRCodeGen import prog8.intermediate.IRFileWriter import prog8.intermediate.IRProgram diff --git a/codeGenIntermediate/test/TestVmCodeGen.kt b/codeGenIntermediate/test/TestVmCodeGen.kt index 055592b5e..cac64f2a4 100644 --- a/codeGenIntermediate/test/TestVmCodeGen.kt +++ b/codeGenIntermediate/test/TestVmCodeGen.kt @@ -1,5 +1,6 @@ import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.ints.shouldBeGreaterThan +import io.kotest.matchers.shouldBe import prog8.code.SymbolTableMaker import prog8.code.ast.* import prog8.code.core.* @@ -98,7 +99,7 @@ class TestVmCodeGen: FunSpec({ val errors = ErrorReporterForTests() val result = codegen.generate(program, st, options, errors) as VmAssemblyProgram val irChunks = (result.irProgram.blocks.first().children.single() as IRSubroutine).chunks - irChunks.size shouldBeGreaterThan 4 + irChunks.size shouldBe 1 } test("float comparison expressions against zero") { @@ -267,7 +268,7 @@ class TestVmCodeGen: FunSpec({ val errors = ErrorReporterForTests() val result = codegen.generate(program, st, options, errors) as VmAssemblyProgram val irChunks = (result.irProgram.blocks.first().children.single() as IRSubroutine).chunks - irChunks.size shouldBeGreaterThan 4 + irChunks.size shouldBe 1 } test("integer comparison expressions against zero") { @@ -436,7 +437,7 @@ class TestVmCodeGen: FunSpec({ val errors = ErrorReporterForTests() val result = codegen.generate(program, st, options, errors) as VmAssemblyProgram val irChunks = (result.irProgram.blocks.first().children.single() as IRSubroutine).chunks - irChunks.size shouldBeGreaterThan 4 + irChunks.size shouldBe 1 } }) \ No newline at end of file diff --git a/compiler/res/version.txt b/compiler/res/version.txt index 2e2f553c9..e17c776ce 100644 --- a/compiler/res/version.txt +++ b/compiler/res/version.txt @@ -1 +1 @@ -8.11 +8.12-dev diff --git a/compiler/src/prog8/compiler/astprocessing/AstChecker.kt b/compiler/src/prog8/compiler/astprocessing/AstChecker.kt index 9f3bacba8..1d4ee27eb 100644 --- a/compiler/src/prog8/compiler/astprocessing/AstChecker.kt +++ b/compiler/src/prog8/compiler/astprocessing/AstChecker.kt @@ -6,7 +6,6 @@ import prog8.ast.base.SyntaxError import prog8.ast.expressions.* import prog8.ast.statements.* import prog8.ast.walk.IAstVisitor -import prog8.code.ast.PtIdentifier import prog8.code.core.* import prog8.code.target.VMTarget import prog8.compiler.builtinFunctionReturnType diff --git a/intermediate/src/prog8/intermediate/IRFileReader.kt b/intermediate/src/prog8/intermediate/IRFileReader.kt index 7ba765a4f..46bdbc0d2 100644 --- a/intermediate/src/prog8/intermediate/IRFileReader.kt +++ b/intermediate/src/prog8/intermediate/IRFileReader.kt @@ -9,7 +9,6 @@ import java.nio.file.Path import javax.xml.stream.XMLEventReader import javax.xml.stream.XMLInputFactory import javax.xml.stream.XMLStreamException -import javax.xml.stream.events.XMLEvent import kotlin.io.path.Path import kotlin.io.path.inputStream