From 06b032af919e5bc5b49269824b3ac52558052cfa Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Thu, 3 Nov 2022 00:20:31 +0100
Subject: [PATCH] refactor

---
 .../src/prog8/codegen/vm}/VmCodeGen.kt                         | 2 +-
 compiler/build.gradle                                          | 1 +
 compiler/compiler.iml                                          | 3 ++-
 compiler/src/prog8/compiler/Compiler.kt                        | 2 +-
 docs/source/todo.rst                                           | 3 +++
 virtualmachine/build.gradle                                    | 1 -
 virtualmachine/virtualmachine.iml                              | 1 -
 7 files changed, 8 insertions(+), 5 deletions(-)
 rename {virtualmachine/src/prog8/vm/codegen => codeGenIntermediate/src/prog8/codegen/vm}/VmCodeGen.kt (97%)

diff --git a/virtualmachine/src/prog8/vm/codegen/VmCodeGen.kt b/codeGenIntermediate/src/prog8/codegen/vm/VmCodeGen.kt
similarity index 97%
rename from virtualmachine/src/prog8/vm/codegen/VmCodeGen.kt
rename to codeGenIntermediate/src/prog8/codegen/vm/VmCodeGen.kt
index 824bffc2e..d29f3d648 100644
--- a/virtualmachine/src/prog8/vm/codegen/VmCodeGen.kt
+++ b/codeGenIntermediate/src/prog8/codegen/vm/VmCodeGen.kt
@@ -1,4 +1,4 @@
-package prog8.vm.codegen
+package prog8.codegen.vm
 
 import prog8.code.SymbolTable
 import prog8.code.ast.PtProgram
diff --git a/compiler/build.gradle b/compiler/build.gradle
index 7193556db..cdf3d9fc0 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -31,6 +31,7 @@ dependencies {
     implementation project(':codeOptimizers')
     implementation project(':compilerAst')
     implementation project(':codeGenCpu6502')
+    implementation project(':codeGenIntermediate')
     implementation project(':codeGenExperimental')
     implementation project(':virtualmachine')
     implementation 'org.antlr:antlr4-runtime:4.10.1'
diff --git a/compiler/compiler.iml b/compiler/compiler.iml
index 3803d9874..a0e97047a 100644
--- a/compiler/compiler.iml
+++ b/compiler/compiler.iml
@@ -21,6 +21,7 @@
     <orderEntry type="module" module-name="codeOptimizers" />
     <orderEntry type="module" module-name="codeGenCpu6502" />
     <orderEntry type="module" module-name="codeGenExperimental" />
+    <orderEntry type="module" module-name="codeGenIntermediate" />
     <orderEntry type="module" module-name="virtualmachine" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/compiler/src/prog8/compiler/Compiler.kt b/compiler/src/prog8/compiler/Compiler.kt
index ca2613bea..bf2531d9f 100644
--- a/compiler/src/prog8/compiler/Compiler.kt
+++ b/compiler/src/prog8/compiler/Compiler.kt
@@ -14,10 +14,10 @@ import prog8.ast.walk.IAstVisitor
 import prog8.code.SymbolTable
 import prog8.code.core.*
 import prog8.code.target.*
+import prog8.codegen.vm.VmCodeGen
 import prog8.compiler.astprocessing.*
 import prog8.optimizer.*
 import prog8.parser.ParseError
-import prog8.vm.codegen.VmCodeGen
 import java.nio.file.Path
 import kotlin.io.path.Path
 import kotlin.io.path.nameWithoutExtension
diff --git a/docs/source/todo.rst b/docs/source/todo.rst
index 7e80d6c7b..d6da5deed 100644
--- a/docs/source/todo.rst
+++ b/docs/source/todo.rst
@@ -3,6 +3,9 @@ TODO
 
 For next release
 ^^^^^^^^^^^^^^^^
+- ir: get rid of '_' label prefix?
+- fix expericodegen (ir code gen for regular cx16 target)
+
 ...
 
 
diff --git a/virtualmachine/build.gradle b/virtualmachine/build.gradle
index 53cfa899f..95a9fb1a8 100644
--- a/virtualmachine/build.gradle
+++ b/virtualmachine/build.gradle
@@ -27,7 +27,6 @@ compileTestKotlin {
 dependencies {
     implementation project(':codeCore')
     implementation project(':intermediate')
-    implementation project(':codeGenIntermediate')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.16"
     testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.3.2'
diff --git a/virtualmachine/virtualmachine.iml b/virtualmachine/virtualmachine.iml
index c03a653ff..6cf1ccbbb 100644
--- a/virtualmachine/virtualmachine.iml
+++ b/virtualmachine/virtualmachine.iml
@@ -14,6 +14,5 @@
     <orderEntry type="library" name="io.kotest.runner.junit5.jvm" level="project" />
     <orderEntry type="module" module-name="codeCore" />
     <orderEntry type="module" module-name="intermediate" />
-    <orderEntry type="module" module-name="codeGenIntermediate" />
   </component>
 </module>
\ No newline at end of file