BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-16 01:07:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor FieldDef to model presense as an enum rather than 2 bools. (#6420)

Browse Source 
* Define presence.

* Migrate to IsRequired and IsOptional methods

* moved stuff around

* Removed optional and required bools from FieldDef

* change assert to return error

* Fix tests.cpp

* MakeFieldPresence helper

* fmt

* old c++ compatibility stuff

Co-authored-by: Casper Neo <cneo@google.com>
This commit is contained in:
Casper
2021-01-25 12:29:43 -05:00
committed by GitHub
parent 0984d4328d
commit e581013e3d
14 changed files with 183 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/idl_gen_ts.cpp
View File

@@ -355,7 +355,7 @@ class TsGenerator : public BaseGenerator {
} else {
*arguments +=
", " + nameprefix + field.name + ": " +
GenTypeName(imports, field, field.value.type, true, field.optional);
GenTypeName(imports, field, field.value.type, true, field.IsOptional());
}
}
}
@@ -1141,7 +1141,7 @@ class TsGenerator : public BaseGenerator {
if (field.value.type.enum_def) {
code += "):" +
GenTypeName(imports, struct_def, field.value.type, false,
field.optional) +
field.IsOptional()) +
" {\n";
} else {
code += "):" +
@@ -1488,8 +1488,8 @@ class TsGenerator : public BaseGenerator {
for (auto it = struct_def.fields.vec.begin();
it != struct_def.fields.vec.end(); ++it) {
auto &field = **it;
if (!field.deprecated && field.required) {
code += " builder.requiredField(offset, ";
if (!field.deprecated && field.IsRequired()) {
code += " builder.IsRequired()Field(offset, ";
code += NumToString(field.value.offset);
code += ") // " + field.name + "\n";
}
@@ -1566,13 +1566,13 @@ class TsGenerator : public BaseGenerator {
}
static bool HasNullDefault(const FieldDef &field) {
return field.optional && field.value.constant == "null";
return field.IsOptional() && field.value.constant == "null";
}
std::string GetArgType(import_set &imports, const Definition &owner,
const FieldDef &field, bool allowNull) {
return GenTypeName(imports, owner, field.value.type, true,
allowNull && field.optional);
allowNull && field.IsOptional());
}
static std::string GetArgName(const FieldDef &field) {