diff --git a/docs/html/md__compiler.html b/docs/html/md__compiler.html
index 77515fe7f4409361001f5d440091cdfe969239cf..03cae7935369ce915228ae1880224fc8a989f7db 100644
--- a/docs/html/md__compiler.html
+++ b/docs/html/md__compiler.html
@@ -67,7 +67,7 @@ $(document).ready(function(){initNavTree('md__compiler.html','');});
<li><code>-t</code> : If data is contained in this file, generate a <code>filename.json</code> representing the data in the flatbuffer.</li>
<li><code>-o PATH</code> : Output all generated files to PATH (either absolute, or relative to the current directory). If omitted, PATH will be the current directory. PATH should end in your systems path separator, e.g. <code>/</code> or <code>\</code>.</li>
<li><code>-I PATH</code> : when encountering <code>include</code> statements, attempt to load the files from this path. Paths will be tried in the order given, and if all fail (or none are specified) it will try to load relative to the path of the schema file being parsed.</li>
-<li><code>--strict-json</code> : Generate strict JSON (field names are enclosed in quotes). By default, no quotes are generated.</li>
+<li><code>--strict-json</code> : Require & generate strict JSON (field names are enclosed in quotes, no trailing commas in tables/vectors). By default, no quotes are required/generated, and trailing commas are allowed.</li>
<li><code>--no-prefix</code> : Don't prefix enum values in generated C++ by their enum type.</li>
<li><code>--gen-includes</code> : Generate include statements for included schemas the generated file depends on (C++).</li>
<li><code>--proto</code>: Expect input files to be .proto files (protocol buffers). Output the corresponding .fbs file. Currently supports: <code>package</code>, <code>message</code>, <code>enum</code>. Does not support, but will skip without error: <code>import</code>, <code>option</code>. Does not support, will generate error: <code>service</code>, <code>extend</code>, <code>extensions</code>, <code>oneof</code>, <code>group</code>, custom options, nested declarations. </li>
diff --git a/docs/source/Compiler.md b/docs/source/Compiler.md
index 2a07858b7b722cac480d4879177d167507f9f436..f6ae0813deefd2d862157c2d9d5e3e6e99d19a3a 100755
--- a/docs/source/Compiler.md
+++ b/docs/source/Compiler.md
@@ -41,8 +41,9 @@ be generated for each file processed:
fail (or none are specified) it will try to load relative to the path of
the schema file being parsed.
-- `--strict-json` : Generate strict JSON (field names are enclosed in quotes).
- By default, no quotes are generated.
+- `--strict-json` : Require & generate strict JSON (field names are enclosed
+ in quotes, no trailing commas in tables/vectors). By default, no quotes are
+ required/generated, and trailing commas are allowed.
- `--no-prefix` : Don't prefix enum values in generated C++ by their enum
type.
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index ffcef78b8f0a86081ffdcbae64367eb25a095fe5..54feca9d8784818ab051a774a475a6034cd7c59a 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -266,12 +266,13 @@ struct EnumDef : public Definition {
class Parser {
public:
- Parser(bool proto_mode = false)
+ Parser(bool strict_json = false, bool proto_mode = false)
: root_struct_def(nullptr),
source_(nullptr),
cursor_(nullptr),
line_(1),
- proto_mode_(proto_mode) {
+ proto_mode_(proto_mode),
+ strict_json_(strict_json) {
// Just in case none are declared:
namespaces_.push_back(new Namespace());
known_attributes_.insert("deprecated");
@@ -354,6 +355,7 @@ class Parser {
int line_; // the current line being parsed
int token_;
bool proto_mode_;
+ bool strict_json_;
std::string attribute_;
std::vector<std::string> doc_comment_;
diff --git a/src/flatc.cpp b/src/flatc.cpp
index 52d8a7c7cd24b6b1591cc54920569acc3d34a545..c13229f122d411154c441c8fb1a5771e6a870022 100755
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -102,7 +102,8 @@ static void Error(const char *err, const char *obj, bool usage,
printf(
" -o PATH Prefix PATH to all generated files.\n"
" -I PATH Search for includes in the specified path.\n"
- " --strict-json Strict JSON: add quotes to field names.\n"
+ " --strict-json Strict JSON: field names must be / will be quoted,\n"
+ " no trailing commas in tables/vectors.\n"
" --no-prefix Don\'t prefix enum values with the enum type in C++.\n"
" --gen-includes Generate include statements for included schemas the\n"
" generated file depends on (C++).\n"
@@ -174,7 +175,7 @@ int main(int argc, const char *argv[]) {
"specify one of -c -g -j -t -b etc.", true);
// Now process the files:
- flatbuffers::Parser parser(proto_mode);
+ flatbuffers::Parser parser(opts.strict_json, proto_mode);
for (auto file_it = filenames.begin();
file_it != filenames.end();
++file_it) {
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
index f7dd6acfd08a1e5435e781309b41be290397e8b4..ef0fb74803607da18cfb5d47781997094c2b8b57 100644
--- a/src/idl_parser.cpp
+++ b/src/idl_parser.cpp
@@ -480,9 +480,11 @@ void Parser::SerializeStruct(const StructDef &struct_def, const Value &val) {
uoffset_t Parser::ParseTable(const StructDef &struct_def) {
Expect('{');
size_t fieldn = 0;
- if (!IsNext('}')) for (;;) {
+ for (;;) {
+ if ((!strict_json_ || !fieldn) && IsNext('}')) break;
std::string name = attribute_;
- if (!IsNext(kTokenStringConstant)) Expect(kTokenIdentifier);
+ if (!IsNext(kTokenStringConstant))
+ Expect(strict_json_ ? kTokenStringConstant : kTokenIdentifier);
auto field = struct_def.fields.Lookup(name);
if (!field) Error("unknown field: " + name);
if (struct_def.fixed && (fieldn >= struct_def.fields.vec.size()
@@ -574,16 +576,16 @@ uoffset_t Parser::ParseTable(const StructDef &struct_def) {
uoffset_t Parser::ParseVector(const Type &type) {
int count = 0;
- if (token_ != ']') for (;;) {
+ for (;;) {
+ if ((!strict_json_ || !count) && IsNext(']')) break;
Value val;
val.type = type;
ParseAnyValue(val, NULL);
field_stack_.push_back(std::make_pair(val, nullptr));
count++;
- if (token_ == ']') break;
+ if (IsNext(']')) break;
Expect(',');
}
- Next();
builder_.StartVector(count * InlineSize(type) / InlineAlignment(type),
InlineAlignment(type));
diff --git a/tests/test.cpp b/tests/test.cpp
index 5b55926c0d9b53ff76ac961b6b1a88a2639df05d..6cc442209201d65e2a2e75b465705ced7dd99974 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -249,7 +249,7 @@ void ParseProtoTest() {
"tests/prototest/test.golden", false, &goldenfile), true);
// Parse proto.
- flatbuffers::Parser parser(true);
+ flatbuffers::Parser parser(false, true);
TEST_EQ(parser.Parse(protofile.c_str(), nullptr), true);
// Generate fbs.
@@ -493,8 +493,9 @@ void FuzzTest2() {
}
// Test that parser errors are actually generated.
-void TestError(const char *src, const char *error_substr) {
- flatbuffers::Parser parser;
+void TestError(const char *src, const char *error_substr,
+ bool strict_json = false) {
+ flatbuffers::Parser parser(strict_json);
TEST_EQ(parser.Parse(src), false); // Must signal error
// Must be the error we're expecting
TEST_NOTNULL(strstr(parser.error_.c_str(), error_substr));
@@ -522,6 +523,9 @@ void ErrorTest() {
TestError("union Z { X } table X { Y:Z; } root_type X; { Y_type: 99, Y: {",
"type id");
TestError("table X { Y:int; } root_type X; { Z:", "unknown field");
+ TestError("table X { Y:int; } root_type X; { Y:", "string constant", true);
+ TestError("table X { Y:int; } root_type X; { \"Y\":1, }", "string constant",
+ true);
TestError("struct X { Y:int; Z:int; } table W { V:X; } root_type W; "
"{ V:{ Y:1 } }", "incomplete");
TestError("enum E:byte { A } table X { Y:E; } root_type X; { Y:U }",