Unset FieldDef.optional if its key (google#6402)

* Unset FieldDef.optional if its key * removed StringKey table, just removed an extra "required, key" * removed extra newline Co-authored-by: Casper Neo <cneo@google.com>
qbx2 · Jan 12, 2021 · 8573108 · 8573108
1 parent 7abe612
commit 8573108
Show file tree

Hide file tree

Showing 4 changed files with 177 additions and 178 deletions.
diff --git a/src/idl_parser.cpp b/src/idl_parser.cpp
@@ -906,6 +906,7 @@ CheckedError Parser::ParseField(StructDef &struct_def) {
     struct_def.has_key = true;
     if (!IsScalar(type.base_type)) {
       field->required = true;
+      field->optional = false;
       if (type.base_type != BASE_TYPE_STRING)
         return Error("'key' field must be string or scalar type");
     }

diff --git a/tests/monster_test.bfbs b/tests/monster_test.bfbs
diff --git a/tests/monster_test.fbs b/tests/monster_test.fbs
@@ -71,7 +71,7 @@ table Monster {
   pos:Vec3 (id: 0);
   hp:short = 100 (id: 2);
   mana:short = 150 (id: 1);
-  name:string (id: 3, required, key);
+  name:string (id: 3, key);
   color:Color = Blue (id: 6);
   inventory:[ubyte] (id: 5);
   friendly:bool = false (deprecated, priority: 1, id: 4);