moved codeGenVirtual module into virtualmachine module

2026-04-19 20:16:51 +00:00 · 2022-09-26 19:52:12 +02:00
parent 4d6dcbd173
commit 11c000f764
11 changed files with 11 additions and 105 deletions
@@ -1,66 +0,0 @@
-
-plugins {
-    id 'java'
-    id 'application'
-    id "org.jetbrains.kotlin.jvm"
-    id "io.kotest" version "0.3.9"
-}
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(javaVersion)
-    }
-}
-
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = javaVersion
-    }
-}
-
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = javaVersion
-    }
-}
-
-dependencies {
-    implementation project(':codeCore')
-    implementation project(':intermediate')
-    implementation project(':codeGenIntermediate')
-    implementation project(':virtualmachine')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    // implementation "org.jetbrains.kotlin:kotlin-reflect"
-    implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.16"
-
-    testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.3.2'
-}
-
-sourceSets {
-    main {
-        java {
-            srcDirs = ["${project.projectDir}/src"]
-        }
-        resources {
-            srcDirs = ["${project.projectDir}/res"]
-        }
-    }
-    test {
-        java {
-            srcDir "${project.projectDir}/test"
-        }
-    }
-}
-
-test {
-    // Enable JUnit 5 (Gradle 4.6+).
-    useJUnitPlatform()
-
-    // Always run tests, even when nothing changed.
-    dependsOn 'cleanTest'
-
-    // Show test results.
-    testLogging {
-        events "skipped", "failed"
-    }
-}
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="library" name="michael.bull.kotlin.result.jvm" level="project" />
-    <orderEntry type="library" name="io.kotest.assertions.core.jvm" level="project" />
-    <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" />
-    <orderEntry type="module" module-name="virtualmachine" />
-  </component>
-</module>
@@ -1,51 +0,0 @@
-package prog8.codegen.virtual
-
-import prog8.code.SymbolTable
-import prog8.code.ast.PtProgram
-import prog8.code.core.CompilationOptions
-import prog8.code.core.IAssemblyGenerator
-import prog8.code.core.IAssemblyProgram
-import prog8.code.core.IErrorReporter
-import prog8.codegen.intermediate.IRCodeGen
-import prog8.intermediate.IRFileReader
-import prog8.intermediate.IRFileWriter
-import prog8.intermediate.IRProgram
-import java.nio.file.Path
-
-class VmCodeGen(private val program: PtProgram,
-                private val symbolTable: SymbolTable,
-                private val options: CompilationOptions,
-                private val errors: IErrorReporter
-): IAssemblyGenerator {
-    override fun compileToAssembly(): IAssemblyProgram? {
-
-        val irCodeGen = IRCodeGen(program, symbolTable, options, errors)
-        val irProgram = irCodeGen.generate()
-
-        return if(options.keepIR) {
-            //create IR file on disk and read it back.
-            val irFile = IRFileWriter(irProgram, null).write()
-            val irProgram2 = IRFileReader().read(irFile)
-            VmAssemblyProgram(irProgram2.name, irProgram2)
-        } else {
-            VmAssemblyProgram(irProgram.name, irProgram)
-        }
-    }
-
-    companion object {
-        fun compileIR(irFile: Path): IAssemblyProgram {
-            val irProgram = IRFileReader().read(irFile)
-            return VmAssemblyProgram(irProgram.name, irProgram)
-        }
-    }
-}
-
-
-internal class VmAssemblyProgram(override val name: String, private val irProgram: IRProgram): IAssemblyProgram {
-
-    override fun assemble(options: CompilationOptions): Boolean {
-        val writtenFile = IRFileWriter(irProgram, null).write()
-        println("Wrote intermediate representation to $writtenFile")
-        return true
-    }
-}