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

Parser now allows empty tables in JSON

Browse Source 
Bug: 16870719
Change-Id: Ia5fdce49a67b1aa621ab1e37a815e2a3293257b6
Tested: on Linux
This commit is contained in:
Wouter van Oortmerssen
2014-08-12 16:20:13 -07:00
parent 620d8d6f7c
commit 0b47e69d4d
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/idl_gen_text.cpp
View File

@@ -191,7 +191,6 @@ static void GenStruct(const StructDef &struct_def, const Table *table,
std::string *_text) {
std::string &text = *_text;
text += "{";
text += NewLine(opts.indent_step);
int fieldout = 0;
StructDef *union_sd = nullptr;
for (auto it = struct_def.fields.vec.begin();
@@ -202,8 +201,8 @@ static void GenStruct(const StructDef &struct_def, const Table *table,
// The field is present.
if (fieldout++) {
text += ",";
text += NewLine(opts.indent_step);
}
text += NewLine(opts.indent_step);
text.append(indent + opts.indent_step, ' ');
OutputIdentifier(fd.name, opts, _text);
text += ": ";

2
src/idl_parser.cpp
View File

@@ -420,7 +420,7 @@ void Parser::SerializeStruct(const StructDef &struct_def, const Value &val) {
uoffset_t Parser::ParseTable(const StructDef &struct_def) {
Expect('{');
size_t fieldn = 0;
for (;;) {
if (!IsNext('}')) for (;;) {
std::string name = attribute_;
if (!IsNext(kTokenStringConstant)) Expect(kTokenIdentifier);
auto field = struct_def.fields.Lookup(name);