};
struct FieldDef : public Definition {
- FieldDef() : deprecated(false), padding(0) {}
+ FieldDef() : deprecated(false), padding(0), used(false) {}
Value value;
bool deprecated;
- size_t padding; // bytes to always pad after this field
+ size_t padding; // Bytes to always pad after this field.
+ bool used; // Used during JSON parsing to check for repeated fields.
};
struct StructDef : public Definition {
|| struct_def.fields.vec[fieldn] != field)) {
Error("struct field appearing out of order: " + name);
}
- for (auto it = field_stack_.rbegin();
- it != field_stack_.rbegin() + fieldn; ++it) {
- if (it->second == field) Error("field already set: " + name);
- }
Expect(':');
Value val = field->value;
ParseAnyValue(val, field);
if (IsNext('}')) break;
Expect(',');
}
+ for (auto it = field_stack_.rbegin();
+ it != field_stack_.rbegin() + fieldn; ++it) {
+ if (it->second->used)
+ Error("field set more than once: " + it->second->name);
+ it->second->used = true;
+ }
+ for (auto it = field_stack_.rbegin();
+ it != field_stack_.rbegin() + fieldn; ++it) {
+ it->second->used = false;
+ }
if (struct_def.fixed && fieldn != struct_def.fields.vec.size())
Error("incomplete struct initialization: " + struct_def.name);
auto start = struct_def.fixed
TestError("union Z { X } struct X { Y:int; }", "only tables");
TestError("table X { Y:[int]; YLength:int; }", "clash");
TestError("table X { Y:string = 1; }", "scalar");
- TestError("table X { Y:byte; } root_type X; { Y:1, Y:2 }", "already set");
+ TestError("table X { Y:byte; } root_type X; { Y:1, Y:2 }", "more than once");
}
// Additional parser testing not covered elsewhere.