mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-01 19:58:15 +00:00
Arrays of Enumerations without a value for 0 are no longer valid (#8836)
* arrays of enums with no value for 0 now throw errors * move setting key field outside struct check * set to default instead of required * unsure of why these bfbs files have changed at this time, checking them in to run the pipelines. * remove known bad test
This commit is contained in:
@@ -1133,25 +1133,38 @@ CheckedError Parser::ParseField(StructDef& struct_def) {
|
||||
}
|
||||
}
|
||||
|
||||
// For historical convenience reasons, string keys are assumed required.
|
||||
// Scalars are kDefault unless otherwise specified.
|
||||
// Nonscalars are kOptional unless required;
|
||||
field->key = field->attributes.Lookup("key") != nullptr;
|
||||
const bool required = field->attributes.Lookup("required") != nullptr ||
|
||||
(IsString(type) && field->key);
|
||||
const bool default_str_or_vec =
|
||||
((IsString(type) || IsVector(type)) && field->value.constant != "0");
|
||||
const bool optional = IsScalar(type.base_type)
|
||||
? (field->value.constant == "null")
|
||||
: !(required || default_str_or_vec);
|
||||
if (required && optional) {
|
||||
return Error("Fields cannot be both optional and required.");
|
||||
}
|
||||
field->presence = FieldDef::MakeFieldPresence(optional, required);
|
||||
|
||||
if (required && (struct_def.fixed || IsScalar(type.base_type))) {
|
||||
return Error("only non-scalar fields in tables may be 'required'");
|
||||
if (!struct_def.fixed) {
|
||||
// For historical convenience reasons, string keys are assumed required.
|
||||
// Scalars are kDefault unless otherwise specified.
|
||||
// Nonscalars are kOptional unless required;
|
||||
const bool required = field->attributes.Lookup("required") != nullptr ||
|
||||
(IsString(type) && field->key);
|
||||
const bool default_str_or_vec =
|
||||
((IsString(type) || IsVector(type)) && field->value.constant != "0");
|
||||
const bool optional = IsScalar(type.base_type)
|
||||
? (field->value.constant == "null")
|
||||
: !(required || default_str_or_vec);
|
||||
if (required && optional) {
|
||||
return Error("Fields cannot be both optional and required.");
|
||||
}
|
||||
field->presence = FieldDef::MakeFieldPresence(optional, required);
|
||||
|
||||
if (required && IsScalar(type.base_type)) {
|
||||
return Error("only non-scalar fields in tables may be 'required'");
|
||||
}
|
||||
} else {
|
||||
// all struct fields are required
|
||||
field->presence = FieldDef::kDefault;
|
||||
|
||||
// setting required or optional on a struct field is meaningless
|
||||
if (field->attributes.Lookup("required") != nullptr ||
|
||||
field->attributes.Lookup("optional") != nullptr) {
|
||||
return Error("struct fields are always required");
|
||||
}
|
||||
}
|
||||
|
||||
if (field->key) {
|
||||
if (struct_def.has_key) return Error("only one field may be set as 'key'");
|
||||
struct_def.has_key = true;
|
||||
@@ -1188,6 +1201,23 @@ CheckedError Parser::ParseField(StructDef& struct_def) {
|
||||
}
|
||||
}
|
||||
|
||||
auto check_enum = [this](const FieldDef* field, const Type& type,
|
||||
const std::string& name,
|
||||
const std::string& constant) -> CheckedError {
|
||||
// Optional and bitflags enums may have default constants that are not
|
||||
// their specified variants.
|
||||
if (!field->IsOptional() &&
|
||||
type.enum_def->attributes.Lookup("bit_flags") == nullptr) {
|
||||
if (type.enum_def->FindByValue(constant) == nullptr) {
|
||||
return Error("default value of `" + constant + "` for " + "field `" +
|
||||
name + "` is not part of enum `" + type.enum_def->name +
|
||||
"`.");
|
||||
}
|
||||
}
|
||||
|
||||
return NoError();
|
||||
};
|
||||
|
||||
if (type.enum_def) {
|
||||
// Verify the enum's type and default value.
|
||||
const std::string& constant = field->value.constant;
|
||||
@@ -1203,19 +1233,19 @@ CheckedError Parser::ParseField(StructDef& struct_def) {
|
||||
if (constant != "0") {
|
||||
return Error("Array defaults are not supported yet.");
|
||||
}
|
||||
CheckedError err = check_enum(field, type.VectorType(), name, constant);
|
||||
if (err.Check()) {
|
||||
// reset the check state of the error
|
||||
return CheckedError{err};
|
||||
}
|
||||
} else {
|
||||
if (!IsInteger(type.base_type)) {
|
||||
return Error("Enums must have integer base types");
|
||||
}
|
||||
// Optional and bitflags enums may have default constants that are not
|
||||
// their specified variants.
|
||||
if (!field->IsOptional() &&
|
||||
type.enum_def->attributes.Lookup("bit_flags") == nullptr) {
|
||||
if (type.enum_def->FindByValue(constant) == nullptr) {
|
||||
return Error("default value of `" + constant + "` for " + "field `" +
|
||||
name + "` is not part of enum `" + type.enum_def->name +
|
||||
"`.");
|
||||
}
|
||||
CheckedError err = check_enum(field, type, name, constant);
|
||||
if (err.Check()) {
|
||||
// reset the check state of the error
|
||||
return CheckedError{err};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@@ -2,9 +2,10 @@ enum NonZero: ubyte {
|
||||
VAL = 1,
|
||||
}
|
||||
|
||||
struct NonZeroArrayStruct {
|
||||
data: [NonZero:4];
|
||||
}
|
||||
// this now is not allowed because arrays of enums must have a zero value
|
||||
// struct NonZeroArrayStruct {
|
||||
// data: [NonZero:4];
|
||||
// }
|
||||
|
||||
table NonZeroVectorTable {
|
||||
values: [NonZero];
|
||||
|
||||
Reference in New Issue
Block a user