simplified code generation and moved it under kotlinGen

elect86 · elect86 · commit b99a4258a9f8 · 2023-11-07T13:40:17.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
     id("elect86.magik") version "0.3.3"
     `maven-publish`
     signing
-//    id("com.github.johnrengelman.shadow") version "8.1.1"
+    //    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 repositories {
@@ -27,12 +27,7 @@ dependencies {
 kotlin.jvmToolchain { languageVersion.set(JavaLanguageVersion.of(8)) }
 
 tasks {
-    withType<KotlinCompile<*>>().all {
-        kotlinOptions {
-            languageVersion = "1.8"
-            freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn")
-        }
-    }
+    withType<KotlinCompile<*>>().all { kotlinOptions { freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn") } }
     val generateCode by registering(GenerateCode::class)
     kotlin.sourceSets { main { kotlin.srcDir(generateCode) } }
     test { useJUnitPlatform() }
diff --git a/buildSrc/src/main/kotlin/kool/buffersJvm.kt b/buildSrc/src/main/kotlin/kool/buffersJvm.kt
@@ -4,11 +4,9 @@ import kool.gen.Generator
 import kool.gen.generate
 import java.io.File
 
-fun buffersJvm(target: File) {
+fun buffersJvm() {
 
-    generate(target, "kool/buffersJvm.kt") {
-
-        `package` = "kool"
+    generate( "buffersJvm") {
 
         suppressInlineWarning = true
         experimentals += Generator.Experimentals.TypeInference
diff --git a/buildSrc/src/main/kotlin/kool/builders.kt b/buildSrc/src/main/kotlin/kool/builders.kt
@@ -4,11 +4,9 @@ import kool.gen.Generator
 import kool.gen.generate
 import java.io.File
 
-fun builders(target: File) {
+fun builders() {
 
-    generate(target, "kool/builders.kt") {
-
-        `package` = "kool"
+    generate("builders") {
 
         experimentals += Generator.Experimentals.TypeInference
         //        suppressInlineWarning = true
diff --git a/buildSrc/src/main/kotlin/kool/conversions.kt b/buildSrc/src/main/kotlin/kool/conversions.kt
@@ -4,11 +4,9 @@ import kool.gen.Generator
 import kool.gen.generate
 import java.io.File
 
-fun conversions(target: File) {
+fun conversions() {
 
-    generate(target, "kool/conversions.kt") {
-
-        `package` = "kool"
+    generate("conversions") {
 
         experimentals += Generator.Experimentals.UnsignedTypes
         //        suppressInlineWarning = true
diff --git a/buildSrc/src/main/kotlin/kool/extensions.kt b/buildSrc/src/main/kotlin/kool/extensions.kt
@@ -4,11 +4,9 @@ import kool.gen.Generator
 import kool.gen.generate
 import java.io.File
 
-fun extensions(target: File) {
+fun extensions() {
 
-    generate(target, "kool/extensions.kt") {
-
-        `package` = "kool"
+    generate("extensions") {
 
         //        suppressInlineWarning = true
 
diff --git a/buildSrc/src/main/kotlin/kool/gen/GenerateCode.kt b/buildSrc/src/main/kotlin/kool/gen/GenerateCode.kt
@@ -5,7 +5,6 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.file.Directory
 import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.file.ProjectLayout
-import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import java.io.File
@@ -24,44 +23,45 @@ abstract class GenerateCode: DefaultTask() {
     @get:Inject
     abstract val files: FileSystemOperations
 
-    @get:OutputDirectory
-    val targetDir: Directory = layout.projectDirectory.dir("src/mainGen/kotlin")
+    @OutputDirectory
+    val targetDir: Directory = layout.projectDirectory.dir("src/main/kotlinGen")
 
     @TaskAction
     fun generate() {
         files.delete { delete(targetDir) }
-        val target = targetDir.asFile
+        Generator.targetDir = targetDir.asFile
 
-        ubuffers(target)
+        ubuffers()
 
-        buffersJvm(target)
+        buffersJvm()
 
-        iterators(target)
+        iterators()
 
-        extensions(target)
+        extensions()
 
-        builders(target)
+        builders()
 
-        conversions(target)
+        conversions()
 
-        pointers(target)
+        pointers()
 
-        stackExts(target)
+        stackExts()
 
-        stack(target)
+        stack()
 
-        unsafe(target)
+        unsafe()
     }
 }
 
-fun generate(targetDir: File, file: String, block: Generator.() -> Unit) {
-    Generator(targetDir).apply {
+fun generate(file: String, block: Generator.() -> Unit) {
+    Generator().apply {
         builder.append('\n')
         block()
         for (import in imports)
             builder.insert(0, "import $import\n")
-        if (`package`.isNotEmpty())
-            builder.insert(0, "package $`package`\n")
+        val f = file.replace('/', '.').substringBefore('.', "")
+        val pack = if (f.isEmpty()) "kool" else "kool.$f"
+        builder.insert(0, "package $pack\n\n")
         if (experimentals.isNotEmpty()) {
             val list = experimentals.joinToString { "${it.pkg}.Experimental${it.name}::class" }
             builder.insert(0, "@file:OptIn($list)\n")
diff --git a/buildSrc/src/main/kotlin/kool/gen/Generator.kt b/buildSrc/src/main/kotlin/kool/gen/Generator.kt
@@ -5,12 +5,11 @@ import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.collections.HashSet
 
-class Generator(val targetDir: File) {
+class Generator {
 
     val builder = StringBuilder()
     var indentation = ""
 
-    var `package` = ""
     var imports = HashSet<String>()
     val experimentals = ArrayList<Experimentals>()
     var disableNameShadowing = false
@@ -108,8 +107,8 @@ class Generator(val targetDir: File) {
             }
         }
 
-    fun write(kt: String) {
-        File(targetDir, kt).apply {
+    fun write(path: String) {
+        File(targetDir, "kool/$path.kt").apply {
             parentFile.mkdirs()
             writeText(builder.toString())
         }
@@ -150,4 +149,8 @@ class Generator(val targetDir: File) {
 
     // dont change order (+ and - first, then * and /). Quat operator generation relies on this
     val operators = listOf("+" to "plus", "-" to "minus", "*" to "times", "/" to "div")
+
+    companion object {
+        lateinit var targetDir: File
+    }
 }
diff --git a/buildSrc/src/main/kotlin/kool/iterators.kt b/buildSrc/src/main/kotlin/kool/iterators.kt
@@ -3,11 +3,9 @@ package kool
 import kool.gen.generate
 import java.io.File
 
-fun iterators(target: File) {
+fun iterators() {
 
-    generate(target, "kool/iterators.kt") {
-
-        `package` = "kool"
+    generate("iterators") {
 
 //        suppressInlineWarning = true
 
diff --git a/buildSrc/src/main/kotlin/kool/pointers.kt b/buildSrc/src/main/kotlin/kool/pointers.kt
@@ -4,11 +4,9 @@ import kool.gen.generate
 import kool.gen.Generator
 import java.io.File
 
-fun pointers(target: File) {
+fun pointers() {
 
-    generate(target, "kool/pointers.kt") {
-
-        `package` = "kool"
+    generate("pointers") {
 
         experimentals += Generator.Experimentals.TypeInference
         suppressInlineWarning = true
diff --git a/buildSrc/src/main/kotlin/kool/stack.kt b/buildSrc/src/main/kotlin/kool/stack.kt
@@ -5,11 +5,9 @@ import kool.gen.generate
 import org.gradle.configurationcache.extensions.capitalized
 import java.io.File
 
-fun stack(target: File) {
+fun stack() {
 
-    generate(target, "kool/stack.kt") {
-
-        `package` = "kool"
+    generate("stack") {
 
         experimentals += Generator.Experimentals.Contracts
         //        suppressInlineWarning = true
diff --git a/buildSrc/src/main/kotlin/kool/stackExts.kt b/buildSrc/src/main/kotlin/kool/stackExts.kt
@@ -5,11 +5,9 @@ import kool.gen.generate
 import org.gradle.configurationcache.extensions.capitalized
 import java.io.File
 
-fun stackExts(target: File) {
+fun stackExts() {
 
-    generate(target, "kool/stackExts.kt") {
-
-        `package` = "kool"
+    generate("stackExts") {
 
         experimentals += Generator.Experimentals.UnsignedTypes
         //        suppressInlineWarning = true
diff --git a/buildSrc/src/main/kotlin/kool/ubuffers.kt b/buildSrc/src/main/kotlin/kool/ubuffers.kt
@@ -4,12 +4,10 @@ import kool.gen.Generator
 import kool.gen.generate
 import java.io.File
 
-fun ubuffers(target: File) {
+fun ubuffers() {
 
     for ((type, ext, conv) in numberTypeInformation.filter { it.type in unsignedTypes })
-        generate(target, "kool/ubuffers/${type}Buffer.kt") {
-
-            `package` = "kool.ubuffers"
+        generate("ubuffers/${type}Buffer") {
 
             experimentals += listOf(Generator.Experimentals.TypeInference, Generator.Experimentals.UnsignedTypes)
 
diff --git a/buildSrc/src/main/kotlin/kool/unsafe.kt b/buildSrc/src/main/kotlin/kool/unsafe.kt
@@ -3,11 +3,9 @@ package kool
 import kool.gen.generate
 import java.io.File
 
-fun unsafe(target: File) {
+fun unsafe() {
 
-    generate(target, "kool/unsafe.kt") {
-
-        `package` = "kool"
+    generate("unsafe") {
 
         //        experimentals += Generator.Experimentals.Contracts
         suppressInlineWarning = true
diff --git a/src/main/kotlinGen/kool/buffersJvm.kt b/src/main/kotlinGen/kool/buffersJvm.kt
@@ -1,6 +1,7 @@
 @file:Suppress("NOTHING_TO_INLINE")
 @file:OptIn(kotlin.experimental.ExperimentalTypeInference::class, kotlin.ExperimentalUnsignedTypes::class)
 package kool
+
 import kool.ubuffers.UByteBuffer
 import java.nio.LongBuffer
 import kool.ubuffers.UShortBuffer
diff --git a/src/main/kotlinGen/kool/builders.kt b/src/main/kotlinGen/kool/builders.kt
@@ -1,5 +1,6 @@
 @file:OptIn(kotlin.experimental.ExperimentalTypeInference::class)
 package kool
+
 import kool.ubuffers.asUByteBuffer
 import kool.ubuffers.UByteBuffer
 import java.nio.LongBuffer
diff --git a/src/main/kotlinGen/kool/conversions.kt b/src/main/kotlinGen/kool/conversions.kt
@@ -1,5 +1,6 @@
 @file:OptIn(kotlin.ExperimentalUnsignedTypes::class)
 package kool
+
 import kool.ubuffers.UByteBuffer
 import java.nio.LongBuffer
 import kool.ubuffers.UShortBuffer
diff --git a/src/main/kotlinGen/kool/extensions.kt b/src/main/kotlinGen/kool/extensions.kt
@@ -1,5 +1,6 @@
 @file:Suppress("NOTHING_TO_INLINE")
 package kool
+
 import java.nio.ByteBuffer
 import org.lwjgl.PointerBuffer
 import java.nio.LongBuffer
diff --git a/src/main/kotlinGen/kool/iterators.kt b/src/main/kotlinGen/kool/iterators.kt
@@ -1,4 +1,5 @@
 package kool
+
 import kool.ubuffers.UByteBuffer
 import java.nio.LongBuffer
 import kool.ubuffers.UShortBuffer
diff --git a/src/main/kotlinGen/kool/pointers.kt b/src/main/kotlinGen/kool/pointers.kt
@@ -1,6 +1,7 @@
 @file:Suppress("NOTHING_TO_INLINE")
 @file:OptIn(kotlin.experimental.ExperimentalTypeInference::class)
 package kool
+
 import kool.ubuffers.asUByteBuffer
 import kool.ubuffers.UByteBuffer
 import java.nio.LongBuffer
diff --git a/src/main/kotlinGen/kool/stack.kt b/src/main/kotlinGen/kool/stack.kt
@@ -1,5 +1,6 @@
 @file:OptIn(kotlin.contracts.ExperimentalContracts::class)
 package kool
+
 import kool.ubuffers.asUByteBuffer
 import kool.ubuffers.UByteBuffer
 import java.nio.LongBuffer
diff --git a/src/main/kotlinGen/kool/stackExts.kt b/src/main/kotlinGen/kool/stackExts.kt
@@ -1,5 +1,6 @@
 @file:OptIn(kotlin.ExperimentalUnsignedTypes::class)
 package kool
+
 import kool.ubuffers.UByteBuffer
 import java.nio.LongBuffer
 import kool.ubuffers.UShortBuffer
diff --git a/src/main/kotlinGen/kool/ubuffers/UByteBuffer.kt b/src/main/kotlinGen/kool/ubuffers/UByteBuffer.kt
@@ -1,6 +1,7 @@
 @file:Suppress("NOTHING_TO_INLINE")
 @file:OptIn(kotlin.experimental.ExperimentalTypeInference::class, kotlin.ExperimentalUnsignedTypes::class)
 package kool.ubuffers
+
 import kool.ubuffers.UByteBuffer
 import kool.isEmpty
 import kool.sliceAs
diff --git a/src/main/kotlinGen/kool/ubuffers/UIntBuffer.kt b/src/main/kotlinGen/kool/ubuffers/UIntBuffer.kt
@@ -1,6 +1,7 @@
 @file:Suppress("NOTHING_TO_INLINE")
 @file:OptIn(kotlin.experimental.ExperimentalTypeInference::class, kotlin.ExperimentalUnsignedTypes::class)
 package kool.ubuffers
+
 import kool.isEmpty
 import java.nio.IntBuffer
 import kool.sliceAs
diff --git a/src/main/kotlinGen/kool/ubuffers/ULongBuffer.kt b/src/main/kotlinGen/kool/ubuffers/ULongBuffer.kt
@@ -1,6 +1,7 @@
 @file:Suppress("NOTHING_TO_INLINE")
 @file:OptIn(kotlin.experimental.ExperimentalTypeInference::class, kotlin.ExperimentalUnsignedTypes::class)
 package kool.ubuffers
+
 import java.nio.LongBuffer
 import kool.isEmpty
 import kool.ubuffers.ULongBuffer
diff --git a/src/main/kotlinGen/kool/ubuffers/UShortBuffer.kt b/src/main/kotlinGen/kool/ubuffers/UShortBuffer.kt
@@ -1,6 +1,7 @@
 @file:Suppress("NOTHING_TO_INLINE")
 @file:OptIn(kotlin.experimental.ExperimentalTypeInference::class, kotlin.ExperimentalUnsignedTypes::class)
 package kool.ubuffers
+
 import kool.isEmpty
 import kool.ubuffers.UShortBuffer
 import kool.sliceAs
diff --git a/src/main/kotlinGen/kool/unsafe.kt b/src/main/kotlinGen/kool/unsafe.kt
@@ -1,5 +1,6 @@
 @file:Suppress("NOTHING_TO_INLINE")
 package kool
+
 import sun.misc.Unsafe
 
 /**
