BigfootDev/flatbuffers-bigfoot
1
0
Fork 0
forked from BigfootDev/flatbuffers
Code Pull Requests Activity

Support --conform for vector of unions (#6883)

Browse Source 
It seems like `--conform` already works for vectors of unions - there is
just a spurious check that prevents it from running. Fixes #6882

Also, if schemas do not conform, `flatc` no longer prints out the usage
(since the error is not due to bad usage). Fixes #6496
This commit is contained in:
Alec Theriault
2021-11-01 14:26:36 -04:00
committed by GitHub
parent 8433eb108c
commit c0394bb09c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/flatc.cpp
View File

@@ -519,7 +519,7 @@ int FlatCompiler::Compile(int argc, const char **argv) {
} }
if ((is_schema || is_binary_schema) && !conform_to_schema.empty()) { if ((is_schema || is_binary_schema) && !conform_to_schema.empty()) {
auto err = parser->ConformTo(conform_parser); auto err = parser->ConformTo(conform_parser);
if (!err.empty()) Error("schemas don\'t conform: " + err); if (!err.empty()) Error("schemas don\'t conform: " + err, false);
} }
if (schema_binary || opts.binary_schema_gen_embed) { if (schema_binary || opts.binary_schema_gen_embed) {
parser->Serialize(); parser->Serialize();

5
src/idl_parser.cpp
View File

@@ -2478,8 +2478,7 @@ bool Parser::SupportsDefaultVectorsAndStrings() const {
} }
bool Parser::SupportsAdvancedUnionFeatures() const { bool Parser::SupportsAdvancedUnionFeatures() const {
return opts.lang_to_generate != 0 && return (opts.lang_to_generate &
(opts.lang_to_generate &
~(IDLOptions::kCpp | IDLOptions::kTs | IDLOptions::kPhp | ~(IDLOptions::kCpp | IDLOptions::kTs | IDLOptions::kPhp |
IDLOptions::kJava | IDLOptions::kCSharp | IDLOptions::kKotlin | IDLOptions::kJava | IDLOptions::kCSharp | IDLOptions::kKotlin |
IDLOptions::kBinary | IDLOptions::kSwift)) == 0; IDLOptions::kBinary | IDLOptions::kSwift)) == 0;
@@ -3255,7 +3254,7 @@ CheckedError Parser::ParseRoot(const char *source, const char **include_paths,
for (auto val_it = enum_def.Vals().begin(); for (auto val_it = enum_def.Vals().begin();
val_it != enum_def.Vals().end(); ++val_it) { val_it != enum_def.Vals().end(); ++val_it) {
auto &val = **val_it; auto &val = **val_it;
if (!SupportsAdvancedUnionFeatures() && if (!(opts.lang_to_generate != 0 && SupportsAdvancedUnionFeatures()) &&
(IsStruct(val.union_type) || IsString(val.union_type))) (IsStruct(val.union_type) || IsString(val.union_type)))
return Error( return Error(
"only tables can be union elements in the generated language: " + "only tables can be union elements in the generated language: " +