pure kotlin dependency-free Marshaller/Unmarshaller and native

This provides native variants for all the components.

Code is adapted from java protobuf code.

Author: phcoder

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.11'
+    ext.kotlin_version = '1.3.20'
     repositories {
         mavenCentral()
         maven {

conformance/conformance-native/src/main/kotlin/pbandk/conformance/Platform.kt

@@ -0,0 +1,70 @@
+// Copyright 2019 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package pbandk.conformance
+
+import platform.posix.*
+import kotlinx.cinterop.cstr
+import kotlinx.cinterop.usePinned
+import kotlinx.cinterop.addressOf
+
+actual object Platform {
+    actual fun stderrPrintln(str: String) {
+        val strn = str + "\n"
+        val cstr = strn.cstr
+        write(2, cstr, cstr.size.toULong())
+    }
+
+    actual fun stdinReadIntLE() = ByteArray(4).let {
+        if (readBytes(0, it) != 4) null else
+            it.foldRight(0) { byte, acc ->
+                (acc shl 8) or (byte.toInt() and 0xff)
+            }
+    }
+
+    private fun readBytes(fd: Int, arr: ByteArray): Int {
+        arr.usePinned {
+            return read(fd, it.addressOf(0), arr.size.toULong()).toInt()
+        }
+    }
+
+    actual fun stdinReadFull(arr: ByteArray) =
+        require(readBytes(0, arr) == arr.size) { "Unable to read full byte array" }
+
+    actual fun stdoutWriteIntLE(v: Int) =
+            stdoutWriteFull (ByteArray(4) { (v shr (8 * it)).toByte() })
+
+    actual fun stdoutWriteFull(arr: ByteArray) {
+        arr.usePinned {
+            write(1, it.addressOf(0), arr.size.toULong())
+        }
+    }
+
+    actual inline fun <T> doTry(fn: () -> T, errFn: (Any) -> T) = try { fn() } catch (e: Exception) { errFn(e) }
+}

conformance/conformance-native/src/main/kotlin/pbandk/main.kt

@@ -0,0 +1,4 @@
+
+fun main(args: Array<String>) {
+    pbandk.conformance.main(args)
+}

protoc-gen-kotlin/protoc-gen-kotlin-common/src/main/kotlin/pbandk/gen/Main.kt

@@ -8,7 +8,12 @@ inline fun debug(fn: () -> String) { if (logDebug) Platform.stderrPrintln(fn())
 
 fun main(args: Array<String>) {
     // Read the request from stdin and write response into stdout
-    Platform.stdoutWriteResponse(runGenerator(Platform.stdinReadRequest()))
+    try {
+        Platform.stdoutWriteResponse(runGenerator(Platform.stdinReadRequest()))
+    } catch (e: Exception) {
+        Platform.stderrPrintln("Caught exception $e")
+        throw e
+    }
 }
 
 fun runGenerator(request: CodeGeneratorRequest): CodeGeneratorResponse {

protoc-gen-kotlin/protoc-gen-kotlin-native/src/main/kotlin/pbandk/gen/Platform.kt

@@ -0,0 +1,79 @@
+// Copyright 2019 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package pbandk.gen
+
+import pbandk.gen.pb.CodeGeneratorRequest
+import pbandk.gen.pb.CodeGeneratorResponse
+import platform.posix.*
+import kotlinx.cinterop.cstr
+import kotlinx.cinterop.usePinned
+import kotlinx.cinterop.addressOf
+
+actual object Platform {
+    actual fun stderrPrintln(str: String) {
+        val strn = str + "\n"
+        val cstr = strn.cstr
+        write(2, cstr, cstr.size.toULong())
+    }
+
+    private fun readBytes(fd: Int): ByteArray {
+        var ret = byteArrayOf()
+        val buf = ByteArray(8192)
+        buf.usePinned {
+            while (true) {
+                val res = read(fd, it.addressOf(0), buf.size.toULong())
+                if (res <= 0)
+                    break
+                ret += buf.sliceArray(0 until res.toInt())
+            }
+        }
+        return ret
+    }
+
+    actual fun stdinReadRequest(): CodeGeneratorRequest {
+        val buf = readBytes(0)
+        try {
+            val cg = CodeGeneratorRequest.protoUnmarshal(buf)
+            return cg
+        } catch (e: Exception) {
+            stderrPrintln("Unmarshall exception: $e")
+            throw e
+        }
+    }
+
+    actual fun stdoutWriteResponse(resp: CodeGeneratorResponse) {
+        val buf = resp.protoMarshal()
+        buf.usePinned {
+            write(1, it.addressOf(0), buf.size.toULong())
+        }
+    }
+
+    actual fun serviceGenerator(cliParams: Map<String, String>): ServiceGenerator? = null
+}

protoc-gen-kotlin/protoc-gen-kotlin-native/src/main/kotlin/pbandk/main.kt

@@ -0,0 +1,4 @@
+
+fun main(args: Array<String>) {
+    pbandk.gen.main(args)
+}

runtime/runtime-common/src/main/kotlin/pbandk/Marshaller.kt

@@ -1,37 +1,32 @@
 package pbandk
 
-expect class Marshaller {
-
-    fun writeTag(tag: Int): Marshaller
-    fun writeDouble(value: Double)
-    fun writeFloat(value: Float)
-    fun writeInt32(value: Int)
-    fun writeInt64(value: Long)
-    fun writeUInt32(value: Int)
-    fun writeUInt64(value: Long)
-    fun writeSInt32(value: Int)
-    fun writeSInt64(value: Long)
-    fun writeFixed32(value: Int)
-    fun writeFixed64(value: Long)
-    fun writeSFixed32(value: Int)
-    fun writeSFixed64(value: Long)
-    fun writeBool(value: Boolean)
-    fun writeString(value: String)
-    fun writeBytes(value: ByteArr)
-    fun writeEnum(value: Message.Enum)
-    fun writeMessage(value: Message<*>)
-    fun writeUnknownFields(fields: Map<Int, UnknownField>)
-    fun <T> writePackedRepeated(list: List<T>, sizeFn: (T) -> Int, writeFn: (T) -> Unit)
-    fun <K, V, T : Message<T>> writeMap(
-        tag: Int,
-        map: Map<K, V>,
-        createEntry: (K, V, Map<Int, pbandk.UnknownField>) -> T
-    )
-
-    // May not return a value if wasn't created with allocate
-    fun complete(): ByteArray?
+class ByteArrayMarshallerOutputStream(private val backingBytes: ByteArray)
+    : pbandk.impl.MarshallerOutputStream {
+    override fun write(arr: ByteArray, offset: Int, len: Int) {
+        arr.copyInto(backingBytes, pos, offset, offset + len)
+        pos += len
+    }
+
+    private var pos = 0
+
+    fun complete() = backingBytes.sliceArray(0 until pos)
 
     companion object {
-        fun allocate(size: Int): Marshaller
+        fun allocate(size: Int) = ByteArrayMarshallerOutputStream(ByteArray(size))
     }
-}
+}
+
+class ByteArrayMarshaller(val stream: ByteArrayMarshallerOutputStream)
+    : pbandk.impl.Marshaller(stream = stream) {
+
+    fun complete() = stream.complete()
+
+    companion object {
+        fun allocate(size: Int) = ByteArrayMarshaller(
+                ByteArrayMarshallerOutputStream.allocate(size))
+    }
+}
+
+typealias Marshaller = pbandk.impl.Marshaller
+typealias Unmarshaller = pbandk.impl.Unmarshaller
+typealias Sizer = pbandk.impl.Sizer

runtime/runtime-common/src/main/kotlin/pbandk/Message.kt

@@ -3,12 +3,13 @@ package pbandk
 interface Message<T : Message<T>> {
     operator fun plus(other: T?): T
     val protoSize: Int
-    fun protoMarshal(m: Marshaller)
-    fun protoMarshal() = Marshaller.allocate(protoSize).also(::protoMarshal).complete()!!
+    fun protoMarshal(m: pbandk.impl.Marshaller)
+    fun protoMarshal() = ByteArrayMarshaller.allocate(protoSize).also(::protoMarshal).complete()
 
     interface Companion<T : Message<T>> {
-        fun protoUnmarshal(u: Unmarshaller): T
-        fun protoUnmarshal(arr: ByteArray) = protoUnmarshal(Unmarshaller.fromByteArray(arr))
+        fun protoUnmarshal(u: pbandk.impl.Unmarshaller): T
+        fun protoUnmarshal(arr: ByteArray) = protoUnmarshal(
+                pbandk.impl.Unmarshaller.fromByteArray(arr))
     }
 
     interface Enum {

runtime/runtime-common/src/main/kotlin/pbandk/Sizer.kt

@@ -1,5 +1,7 @@
 package pbandk
 
+import pbandk.impl.Sizer
+
 data class UnknownField(val fieldNum: Int, val value: Value) {
     constructor(fieldNum: Int, value: Long, fixed: Boolean = false) :
         this(fieldNum, if (fixed) Value.Fixed64(value) else Value.Varint(value))