various fixes (#7986)

dbaileychess · web-flow · commit 28861d1d7d5e · 2023-05-31T11:52:05.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -532,16 +532,17 @@ if(FLATBUFFERS_BUILD_TESTS)
   # The flattest target needs some generated files
   SET(FLATC_OPT --cpp --gen-mutable --gen-object-api --reflect-names)
   SET(FLATC_OPT_COMP ${FLATC_OPT};--gen-compare)
+  SET(FLATC_OPT_SCOPED_ENUMS ${FLATC_OPT_COMP};--scoped-enums)
 
   compile_schema_for_test(tests/alignment_test.fbs "${FLATC_OPT_COMP}")
-  compile_schema_for_test(tests/arrays_test.fbs "${FLATC_OPT_COMP};--scoped-enums")
+  compile_schema_for_test(tests/arrays_test.fbs "${FLATC_OPT_SCOPED_ENUMS}")
   compile_schema_for_test(tests/native_inline_table_test.fbs "${FLATC_OPT_COMP}")
   compile_schema_for_test(tests/native_type_test.fbs "${FLATC_OPT}")
   compile_schema_for_test(tests/key_field/key_field_sample.fbs "${FLATC_OPT_COMP}")
   compile_schema_for_test(tests/64bit/test_64bit.fbs "${FLATC_OPT_COMP};--bfbs-gen-embed")
   compile_schema_for_test(tests/64bit/evolution/v1.fbs "${FLATC_OPT_COMP}")
   compile_schema_for_test(tests/64bit/evolution/v2.fbs "${FLATC_OPT_COMP}")
-  compile_schema_for_test(tests/union_underlying_type_test.fbs "${FLATC_OPT_COMP}")
+  compile_schema_for_test(tests/union_underlying_type_test.fbs "${FLATC_OPT_SCOPED_ENUMS}")
 
   if(FLATBUFFERS_CODE_SANITIZE)
     add_fsanitize_to_target(flattests ${FLATBUFFERS_CODE_SANITIZE})
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
@@ -1218,6 +1218,16 @@ class Parser : public ParserState {
 // These functions return nullptr on success, or an error string,
 // which may happen if the flatbuffer cannot be encoded in JSON (e.g.,
 // it contains non-UTF-8 byte arrays in String values).
+extern bool GenerateTextFromTable(const Parser &parser,
+                                         const void *table,
+                                         const std::string &tablename,
+                                         std::string *text);
+extern const char *GenerateText(const Parser &parser, const void *flatbuffer,
+                                std::string *text);
+extern const char *GenerateTextFile(const Parser &parser,
+                                    const std::string &path,
+                                    const std::string &file_name);
+
 extern const char *GenTextFromTable(const Parser &parser, const void *table,
                                     const std::string &tablename,
                                     std::string *text);
diff --git a/src/idl_gen_text.cpp b/src/idl_gen_text.cpp
@@ -383,6 +383,14 @@ static const char *GenerateTextImpl(const Parser &parser, const Table *table,
   return nullptr;
 }
 
+// Generate a text representation of a flatbuffer in JSON format.
+// Deprecated: please use `GenTextFromTable`
+bool GenerateTextFromTable(const Parser &parser, const void *table,
+                             const std::string &table_name,
+                             std::string *_text) {
+  return GenTextFromTable(parser, table, table_name, _text) != nullptr;
+}
+
 // Generate a text representation of a flatbuffer in JSON format.
 const char *GenTextFromTable(const Parser &parser, const void *table,
                              const std::string &table_name, std::string *_text) {
@@ -392,6 +400,12 @@ const char *GenTextFromTable(const Parser &parser, const void *table,
   return GenerateTextImpl(parser, root, *struct_def, _text);
 }
 
+// Deprecated: please use `GenText`
+const char *GenerateText(const Parser &parser, const void *flatbuffer,
+                         std::string *_text) {
+  return GenText(parser, flatbuffer, _text);
+}
+
 // Generate a text representation of a flatbuffer in JSON format.
 const char *GenText(const Parser &parser, const void *flatbuffer,
                     std::string *_text) {
@@ -406,6 +420,12 @@ static std::string TextFileName(const std::string &path,
   return path + file_name + ".json";
 }
 
+// Deprecated: please use `GenTextFile`
+const char *GenerateTextFile(const Parser &parser, const std::string &path,
+                             const std::string &file_name) {
+  return GenTextFile(parser, path, file_name);
+}
+
 const char *GenTextFile(const Parser &parser, const std::string &path,
                              const std::string &file_name) {
   if (parser.opts.use_flexbuffers) {
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
@@ -2719,7 +2719,8 @@ bool Parser::Supports64BitOffsets() const {
 }
 
 bool Parser::SupportsUnionUnderlyingType() const {
-    return (opts.lang_to_generate & ~(IDLOptions::kCpp | IDLOptions::kTs)) == 0;
+    return (opts.lang_to_generate & ~(IDLOptions::kCpp | IDLOptions::kTs |
+         IDLOptions::kBinary)) == 0;
 }
 
 Namespace *Parser::UniqueNamespace(Namespace *ns) {
diff --git a/tests/alignment_test.cpp b/tests/alignment_test.cpp
@@ -1,6 +1,6 @@
 #include "alignment_test.h"
 
-#include "alignment_test_generated.h"
+#include "tests/alignment_test_generated.h"
 #include "flatbuffers/flatbuffer_builder.h"
 #include "test_assert.h"
 
diff --git a/tests/reflection_test.cpp b/tests/reflection_test.cpp
@@ -1,6 +1,6 @@
 #include "reflection_test.h"
 
-#include "arrays_test_generated.h"
+#include "tests/arrays_test_generated.h"
 #include "flatbuffers/minireflect.h"
 #include "flatbuffers/reflection.h"
 #include "flatbuffers/reflection_generated.h"
diff --git a/tests/test.cpp b/tests/test.cpp
@@ -20,6 +20,12 @@
 #include <memory>
 #include <string>
 
+#if defined(__ANDRIOD__)
+#define INCLUDE_64_BIT_TESTS 0
+#else
+#define INCLUDE_64_BIT_TESTS 1
+#endif
+
 #include "alignment_test.h"
 #include "evolution_test.h"
 #include "flatbuffers/flatbuffers.h"
@@ -38,12 +44,14 @@
 #include "parser_test.h"
 #include "proto_test.h"
 #include "reflection_test.h"
-#include "union_vector/union_vector_generated.h"
+#include "tests/union_vector/union_vector_generated.h"
 #include "union_underlying_type_test_generated.h"
 #if !defined(_MSC_VER) || _MSC_VER >= 1700
-#  include "arrays_test_generated.h"
+#  include "tests/arrays_test_generated.h"
+#endif
+#if INCLUDE_64_BIT_TESTS
+#include "tests/64bit/offset64_test.h"
 #endif
-#include "64bit/offset64_test.h"
 #include "flexbuffers_test.h"
 #include "is_quiet_nan.h"
 #include "monster_test_bfbs_generated.h"  // Generated using --bfbs-comments --bfbs-builtins --cpp --bfbs-gen-embed
@@ -1544,9 +1552,9 @@ void DoNotRequireEofTest(const std::string &tests_data_path) {
 void UnionUnderlyingTypeTest() {
     using namespace UnionUnderlyingType;
     TEST_ASSERT(sizeof(ABC) == sizeof(uint32_t));
-    TEST_ASSERT(ABC::ABC_A == 555);
-    TEST_ASSERT(ABC::ABC_B == 666);
-    TEST_ASSERT(ABC::ABC_C == 777);
+    TEST_ASSERT(static_cast<int32_t>(ABC::A) == 555);
+    TEST_ASSERT(static_cast<int32_t>(ABC::B) == 666);
+    TEST_ASSERT(static_cast<int32_t>(ABC::C) == 777);
 
     DT buffer;
     AT a;
@@ -1577,6 +1585,7 @@ void UnionUnderlyingTypeTest() {
 }
 
 static void Offset64Tests() {
+#if INCLUDE_64_BIT_TESTS
   Offset64Test();
   Offset64SerializedFirst();
   Offset64NestedFlatBuffer();
@@ -1586,6 +1595,7 @@ static void Offset64Tests() {
   Offset64SizePrefix();
   Offset64ManyVectors();
   Offset64ForceAlign();
+#endif
 }
 
 int FlatBufferTests(const std::string &tests_data_path) {
diff --git a/tests/union_underlying_type_test_generated.h b/tests/union_underlying_type_test_generated.h

Original file line number	Diff line number	Diff line change
`@@ -2719,7 +2719,8 @@ bool Parser::Supports64BitOffsets() const {`
`2719`	`2719`	`}`
`2720`	`2720`
`2721`	`2721`	`bool Parser::SupportsUnionUnderlyingType() const {`
`2722`		`- return (opts.lang_to_generate & ~(IDLOptions::kCpp \| IDLOptions::kTs)) == 0;`
	`2722`	`+ return (opts.lang_to_generate & ~(IDLOptions::kCpp \| IDLOptions::kTs \|`
	`2723`	`+ IDLOptions::kBinary)) == 0;`
`2723`	`2724`	`}`
`2724`	`2725`
`2725`	`2726`	`Namespace Parser::UniqueNamespace(Namespace ns) {`