BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-15 08:48:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mass Refactoring to use IsString and other BASE_TYPE helpers (#6193)

Browse Source 
* Updated SupportsAdvancedUnionFeatures to look out for string

* Mass refactoring to use BASE_TYPE helper functions.

Co-authored-by: Casper Neo <cneo@google.com>
This commit is contained in:
Casper
2020-10-20 08:00:31 -07:00
committed by GitHub
parent 8f6fa4b715
commit fe8e3c7e5d
15 changed files with 125 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/idl_gen_kotlin.cpp
View File

@@ -513,7 +513,7 @@ class KotlinGenerator : public BaseGenerator {
if (field.key) key_field = &field;
GenerateAddField(NumToString(field_pos), field, writer, options);
if (field.value.type.base_type == BASE_TYPE_VECTOR) {
if (IsVector(field.value.type)) {
auto vector_type = field.value.type.VectorType();
if (!IsStruct(vector_type)) {
GenerateCreateVectorField(field, writer, options);
@@ -571,7 +571,7 @@ class KotlinGenerator : public BaseGenerator {
writer +=
"val tableOffset = __indirect(vector"
"Location + 4 * (start + middle), bb)";
if (key_field->value.type.base_type == BASE_TYPE_STRING) {
if (IsString(key_field->value.type)) {
writer += "val comp = compareStrings(\\";
writer += GenOffsetGetter(key_field) + "\\";
writer += ", byteKey, bb)";
@@ -1192,7 +1192,7 @@ class KotlinGenerator : public BaseGenerator {
GenerateOverrideFun(
writer, "keysCompare", "o1: Int, o2: Int, _bb: ByteBuffer", "Int",
[&]() {
if (key_field->value.type.base_type == BASE_TYPE_STRING) {
if (IsString(key_field->value.type)) {
writer.SetValue("offset", NumToString(key_field->value.offset));
writer +=
" return compareStrings(__offset({{offset}}, o1, "