From b97b342f595c404dc4fb48673d6104d9bb9e7f98 Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Mon, 19 Aug 2019 17:57:23 -0700 Subject: [PATCH] Fixed missing generated code. Change-Id: Iaa0633167c2a4d4543fc4de2af58112d60d5d1e6 --- samples/kotlin_sample.sh | 2 +- tests/arrays_test_generated.h | 42 +++++++++++++++++++++++++++++++++++ tests/generate_code.sh | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/samples/kotlin_sample.sh b/samples/kotlin_sample.sh index 30ca00a04..ca4ea86dc 100755 --- a/samples/kotlin_sample.sh +++ b/samples/kotlin_sample.sh @@ -56,5 +56,5 @@ echo Running test kotlin -cp ${sampledir}/kotlin/kotlin_sample.jar SampleBinary # Cleanup temporary files. -# rm -rf MyGame/ +rm -rf MyGame/ # rm -rf ${sampledir}/kotlin diff --git a/tests/arrays_test_generated.h b/tests/arrays_test_generated.h index 6cd861673..17b0e5a5c 100644 --- a/tests/arrays_test_generated.h +++ b/tests/arrays_test_generated.h @@ -16,6 +16,13 @@ struct ArrayStruct; struct ArrayTable; struct ArrayTableT; +bool operator==(const NestedStruct &lhs, const NestedStruct &rhs); +bool operator!=(const NestedStruct &lhs, const NestedStruct &rhs); +bool operator==(const ArrayStruct &lhs, const ArrayStruct &rhs); +bool operator!=(const ArrayStruct &lhs, const ArrayStruct &rhs); +bool operator==(const ArrayTableT &lhs, const ArrayTableT &rhs); +bool operator!=(const ArrayTableT &lhs, const ArrayTableT &rhs); + inline const flatbuffers::TypeTable *NestedStructTypeTable(); inline const flatbuffers::TypeTable *ArrayStructTypeTable(); @@ -96,6 +103,18 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) NestedStruct FLATBUFFERS_FINAL_CLASS { }; FLATBUFFERS_STRUCT_END(NestedStruct, 12); +inline bool operator==(const NestedStruct &lhs, const NestedStruct &rhs) { + return + (lhs.a() == rhs.a()) && + (lhs.b() == rhs.b()) && + (lhs.c() == rhs.c()); +} + +inline bool operator!=(const NestedStruct &lhs, const NestedStruct &rhs) { + return !(lhs == rhs); +} + + FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) ArrayStruct FLATBUFFERS_FINAL_CLASS { private: float a_; @@ -147,6 +166,19 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) ArrayStruct FLATBUFFERS_FINAL_CLASS { }; FLATBUFFERS_STRUCT_END(ArrayStruct, 92); +inline bool operator==(const ArrayStruct &lhs, const ArrayStruct &rhs) { + return + (lhs.a() == rhs.a()) && + (lhs.b() == rhs.b()) && + (lhs.c() == rhs.c()) && + (lhs.d() == rhs.d()); +} + +inline bool operator!=(const ArrayStruct &lhs, const ArrayStruct &rhs) { + return !(lhs == rhs); +} + + struct ArrayTableT : public flatbuffers::NativeTable { typedef ArrayTable TableType; flatbuffers::unique_ptr a; @@ -154,6 +186,16 @@ struct ArrayTableT : public flatbuffers::NativeTable { } }; +inline bool operator==(const ArrayTableT &lhs, const ArrayTableT &rhs) { + return + (lhs.a == rhs.a); +} + +inline bool operator!=(const ArrayTableT &lhs, const ArrayTableT &rhs) { + return !(lhs == rhs); +} + + struct ArrayTable FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { typedef ArrayTableT NativeTableType; static const flatbuffers::TypeTable *MiniReflectTypeTable() { diff --git a/tests/generate_code.sh b/tests/generate_code.sh index d086c2f51..d0247cb59 100755 --- a/tests/generate_code.sh +++ b/tests/generate_code.sh @@ -24,7 +24,7 @@ set -e ../flatc --cpp --java --kotlin --csharp --python --gen-mutable --reflect-names --gen-object-api --gen-compare --no-includes monster_extra.fbs monsterdata_extra.json ../flatc --cpp --java --csharp --python --gen-mutable --reflect-names --gen-object-api --gen-compare --no-includes --scoped-enums --jsonschema --cpp-ptr-type flatbuffers::unique_ptr arrays_test.fbs cd ../samples -../flatc --cpp --kotlin --lobster --gen-mutable --reflect-names --gen-object-api --gen-compare --cpp-ptr-type flatbuffers::unique_ptr monster.fbs +../flatc --cpp --lobster --gen-mutable --reflect-names --gen-object-api --gen-compare --cpp-ptr-type flatbuffers::unique_ptr monster.fbs ../flatc -b --schema --bfbs-comments --bfbs-builtins monster.fbs cd ../reflection ./generate_code.sh