BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-08 14:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Implement optional scalars for JSON (#7322)" (#7351)

Browse Source 
This reverts commit a18ea40d6a.
This commit is contained in:
Derek Bailey
2022-06-15 00:32:28 -07:00
committed by GitHub
parent b4647beb8f
commit 9a1913a87a
5 changed files with 10 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/idl_gen_text.cpp
View File

@@ -248,23 +248,11 @@ struct JsonPrinter {
template<typename T>
bool GenField(const FieldDef &fd, const Table *table, bool fixed,
int indent) {
if (fixed) {
return PrintScalar(
reinterpret_cast<const Struct *>(table)->GetField<T>(fd.value.offset),
fd.value.type, indent);
} else if (fd.IsOptional()) {
auto opt = table->GetOptional<T, T>(fd.value.offset);
if (opt) {
return PrintScalar(*opt, fd.value.type, indent);
} else {
text += "null";
return true;
}
} else {
return PrintScalar(
table->GetField<T>(fd.value.offset, GetFieldDefault<T>(fd)),
fd.value.type, indent);
}
return PrintScalar(
fixed ? reinterpret_cast<const Struct *>(table)->GetField<T>(
fd.value.offset)
: table->GetField<T>(fd.value.offset, GetFieldDefault<T>(fd)),
fd.value.type, indent);
}
// Generate text for non-scalar field.