[Kotlin] Control the generation of reflection with --reflect-names

samples/SampleBinary.kt

@@ -24,6 +24,7 @@ import MyGame.Sample.Weapon
 
 import com.google.flatbuffers.FlatBufferBuilder
 
+@kotlin.ExperimentalUnsignedTypes
 class SampleBinary {
 
   companion object {
@@ -45,7 +46,7 @@ class SampleBinary {
 
         // Serialize the FlatBuffer data.
         val name = builder.createString("Orc")
-        val treasure = byteArrayOf(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
+        val treasure = byteArrayOf(0, 1, 2, 3, 4, 5, 6, 7, 8, 9).asUByteArray()
         val inv = Monster.createInventoryVector(builder, treasure)
         val weapons = Monster.createWeaponsVector(builder, weaps)
         val pos = Vec3.createVec3(builder, 1.0f, 2.0f, 3.0f)
@@ -85,7 +86,7 @@ class SampleBinary {
 
         // Get and test the `inventory` FlatBuffer `vector`.
         for (i in 0 until monster.inventoryLength) {
-            assert(monster.inventory(i) == i.toByte().toInt())
+            assert(monster.inventory(i) == i.toUByte())
         }
 
         // Get and test the `weapons` FlatBuffer `vector` of `table`s.

src/idl_gen_kotlin.cpp

@@ -287,6 +287,7 @@ class KotlinGenerator : public BaseGenerator {
     GenerateComment(enum_def.doc_comment, writer, &comment_config);
 
     writer += "@Suppress(\"unused\")";
+    writer += "@kotlin.ExperimentalUnsignedTypes";
     writer += "class " + namer_.Type(enum_def) + " private constructor() {";
     writer.IncrementIdentLevel();
 
@@ -313,7 +314,10 @@ class KotlinGenerator : public BaseGenerator {
       // Average distance between values above which we consider a table
       // "too sparse". Change at will.
       static const uint64_t kMaxSparseness = 5;
-      if (range / static_cast<uint64_t>(enum_def.size()) < kMaxSparseness) {
+      bool generate_names =
+          range / static_cast<uint64_t>(enum_def.size()) < kMaxSparseness &&
+          parser_.opts.mini_reflect == IDLOptions::kTypesAndNames;
+      if (generate_names) {
         GeneratePropertyOneLine(writer, "names", "Array<String>", [&]() {
           writer += "arrayOf(\\";
           auto val = enum_def.Vals().front();
@@ -489,6 +493,7 @@ class KotlinGenerator : public BaseGenerator {
     writer.SetValue("superclass", fixed ? "Struct" : "Table");
 
     writer += "@Suppress(\"unused\")";
+    writer += "@kotlin.ExperimentalUnsignedTypes";
     writer += "class {{struct_name}} : {{superclass}}() {\n";
 
     writer.IncrementIdentLevel();

tests/DictionaryLookup/LongFloatEntry.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class LongFloatEntry : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/DictionaryLookup/LongFloatMap.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class LongFloatMap : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/Example/Ability.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Ability : Struct() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/Example/Any.kt

@@ -3,6 +3,7 @@
 package MyGame.Example
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Any_ private constructor() {
     companion object {
         const val NONE: UByte = 0u

tests/MyGame/Example/AnyAmbiguousAliases.kt

@@ -3,6 +3,7 @@
 package MyGame.Example
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class AnyAmbiguousAliases private constructor() {
     companion object {
         const val NONE: UByte = 0u

tests/MyGame/Example/AnyUniqueAliases.kt

@@ -3,6 +3,7 @@
 package MyGame.Example
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class AnyUniqueAliases private constructor() {
     companion object {
         const val NONE: UByte = 0u

tests/MyGame/Example/Color.kt

@@ -6,6 +6,7 @@ package MyGame.Example
  * Composite components of Monster color.
  */
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Color private constructor() {
     companion object {
         const val Red: UByte = 1u

tests/MyGame/Example/LongEnum.kt

@@ -3,6 +3,7 @@
 package MyGame.Example
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class LongEnum private constructor() {
     companion object {
         const val LongOne: ULong = 2UL

tests/MyGame/Example/Monster.kt

@@ -22,6 +22,7 @@ import kotlin.math.sign
  * an example documentation comment: "monster object"
  */
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Monster : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/Example/Race.kt

@@ -3,6 +3,7 @@
 package MyGame.Example
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Race private constructor() {
     companion object {
         const val None: Byte = -1

tests/MyGame/Example/Referrable.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Referrable : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/Example/Stat.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Stat : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/Example/StructOfStructs.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class StructOfStructs : Struct() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/Example/StructOfStructsOfStructs.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class StructOfStructsOfStructs : Struct() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/Example/Test.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Test : Struct() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/Example/TestSimpleTableWithEnum.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class TestSimpleTableWithEnum : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/Example/TypeAliases.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class TypeAliases : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/Example/Vec3.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Vec3 : Struct() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/Example2/Monster.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Monster : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/InParentNamespace.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class InParentNamespace : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/MyGame/MonsterExtra.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class MonsterExtra : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/flatc/flatc_kotlin_tests.py

@@ -0,0 +1,32 @@
+# Copyright 2022 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flatc_test import *
+
+
+class KotlinTests:
+
+    def EnumValAttributes(self):
+        flatc(["--kotlin", "enum_val_attributes.fbs"])
+
+        subject = assert_file_exists("ValAttributes.kt")
+        assert_file_doesnt_contains(subject, 'val names : Array<String> = arrayOf("Val1", "Val2", "Val3")')
+        assert_file_doesnt_contains(subject, 'fun name(e: Int) : String = names[e]')
+
+    def EnumValAttributes_ReflectNames(self):
+        flatc(["--kotlin", "--reflect-names", "enum_val_attributes.fbs"])
+
+        subject = assert_file_exists("ValAttributes.kt")
+        assert_file_contains(subject, 'val names : Array<String> = arrayOf("Val1", "Val2", "Val3")')
+        assert_file_contains(subject, 'fun name(e: Int) : String = names[e]')

tests/flatc/main.py

@@ -18,10 +18,11 @@
 
 from flatc_test import run_all
 from flatc_cpp_tests import CppTests
+from flatc_kotlin_tests import KotlinTests
 from flatc_ts_tests import TsTests
 from flatc_schema_tests import SchemaTests
 
-passing, failing = run_all(CppTests, TsTests, SchemaTests)
+passing, failing = run_all(CppTests, KotlinTests, TsTests, SchemaTests)
 
 print("")
 print("{0} of {1} tests passed".format(passing, passing + failing))

tests/optional_scalars/OptionalByte.kt

@@ -3,12 +3,11 @@
 package optional_scalars
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class OptionalByte private constructor() {
     companion object {
         const val None: Byte = 0
         const val One: Byte = 1
         const val Two: Byte = 2
-        val names : Array<String> = arrayOf("None", "One", "Two")
-        fun name(e: Int) : String = names[e]
     }
 }

tests/optional_scalars/ScalarStuff.kt

@@ -19,6 +19,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class ScalarStuff : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/union_vector/Attacker.kt

@@ -17,6 +17,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Attacker : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/union_vector/BookReader.kt

@@ -17,6 +17,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class BookReader : Struct() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/union_vector/Character.kt

@@ -1,6 +1,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Character_ private constructor() {
     companion object {
         const val NONE: UByte = 0u

tests/union_vector/FallingTub.kt

@@ -17,6 +17,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class FallingTub : Struct() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/union_vector/Gadget.kt

@@ -1,6 +1,7 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Gadget private constructor() {
     companion object {
         const val NONE: UByte = 0u

tests/union_vector/HandFan.kt

@@ -17,6 +17,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class HandFan : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/union_vector/Movie.kt

@@ -17,6 +17,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Movie : Table() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {

tests/union_vector/Rapunzel.kt

@@ -17,6 +17,7 @@ import java.nio.ByteOrder
 import kotlin.math.sign
 
 @Suppress("unused")
+@kotlin.ExperimentalUnsignedTypes
 class Rapunzel : Struct() {
 
     fun __init(_i: Int, _bb: ByteBuffer)  {