Support native_type for tables when using the C++ object API.

docs/source/languages/cpp.md

@@ -242,6 +242,40 @@ provide the following functions to aide in the serialization process:
     }
 ```
 
+-   `native_type("type")` (on a table): Tables can also be represented with
+native types. For example, the following schema:
+
+```cpp
+    table Matrix {
+      rows: int32;
+      columns: int32;
+      values: [float];
+    }
+```
+
+Could be represented by a user-defined C++ class:
+
+```cpp
+    class Matrix { ... }
+```
+
+In this case, the following function declarations are generated by the compiler.
+The user must provide and link the matching function definitions:
+
+```cpp
+    struct Matrix FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
+      // ...
+      void UnPackTo(
+          Native::Matrix *_o,
+          const ::flatbuffers::resolver_function_t *_resolver = nullptr) const;
+    }
+
+    ::flatbuffers::Offset<Matrix> CreateMatrix(
+        ::flatbuffers::FlatBufferBuilder &_fbb,
+        const NativeMatrixType *_o,
+        const ::flatbuffers::rehasher_function_t *_rehasher = nullptr);
+```
+
 Finally, the following top-level attributes:
 
 -   `native_include("path")` (at file level): Because the `native_type` attribute

scripts/generate_code.py

@@ -334,7 +334,7 @@ def glob(path, pattern):
 )
 
 flatc(
-    ["--cpp", "--gen-mutable", "--gen-object-api", "--reflect-names"],
+    ["--cpp", "--gen-mutable", "--gen-object-api", "--reflect-names", "--gen-compare"],
     schema="native_type_test.fbs",
 )
 

src/idl_gen_cpp.cpp

@@ -485,7 +485,12 @@ class CppGenerator : public BaseGenerator {
             }
           }
 
-          if (!struct_def->fixed) { code_ += "struct " + nativeName + ";"; }
+          // Don't declare a new object API struct type if the table is a
+          // native type.
+          const auto native_type = struct_def->attributes.Lookup("native_type");
+          if (!struct_def->fixed && !native_type) {
+            code_ += "struct " + nativeName + ";";
+          }
         }
         code_ += "";
       }
@@ -494,7 +499,8 @@ class CppGenerator : public BaseGenerator {
     // Generate forward declarations for all equal operators
     if (opts_.generate_object_based_api && opts_.gen_compare) {
       for (const auto &struct_def : parser_.structs_.vec) {
-        if (!struct_def->generated) {
+        const auto native_type = struct_def->attributes.Lookup("native_type");
+        if (!struct_def->generated && !native_type) {
           SetNameSpace(struct_def->defined_namespace);
           auto nativeName = NativeName(Name(*struct_def), struct_def, opts_);
           code_ += "bool operator==(const " + nativeName + " &lhs, const " +
@@ -863,12 +869,23 @@ class CppGenerator : public BaseGenerator {
 
   static std::string NativeName(const std::string &name, const StructDef *sd,
                                 const IDLOptions &opts) {
+    // If the table is a native_type, return the native_type name.
+    const auto native_type = sd->attributes.Lookup("native_type");
+    if (native_type && !sd->fixed) {
+      return native_type->constant;
+    }
+
     return sd && !sd->fixed ? opts.object_prefix + name + opts.object_suffix
                             : name;
   }
 
   std::string WrapNativeNameInNameSpace(const StructDef &struct_def,
                                         const IDLOptions &opts) {
+    // If the table is a native_type, return the native_type name.
+    const auto native_type = struct_def.attributes.Lookup("native_type");
+    if (native_type && !struct_def.fixed) {
+      return native_type->constant;
+    }
     return WrapInNameSpace(struct_def.defined_namespace,
                            NativeName(Name(struct_def), &struct_def, opts));
   }
@@ -2128,6 +2145,12 @@ class CppGenerator : public BaseGenerator {
 
   void GenCompareOperator(const StructDef &struct_def,
                           const std::string &accessSuffix = "") {
+    // Do not generate compare operators for native types.
+    const auto native_type = struct_def.attributes.Lookup("native_type");
+    if (native_type) {
+      return;
+    }
+
     std::string compare_op;
     for (auto it = struct_def.fields.vec.begin();
          it != struct_def.fields.vec.end(); ++it) {
@@ -2793,12 +2816,18 @@ class CppGenerator : public BaseGenerator {
 
   // Generate an accessor struct, builder structs & function for a table.
   void GenTable(const StructDef &struct_def) {
-    if (opts_.generate_object_based_api) { GenNativeTable(struct_def); }
+    // Don't generate an object API struct for the table if it is a native type.
+    const auto native_type = struct_def.attributes.Lookup("native_type");
+    if (opts_.generate_object_based_api && !native_type) {
+      GenNativeTable(struct_def);
+    }
 
     // Generate an accessor struct, with methods of the form:
     // type name() const { return GetField<type>(offset, defaultval); }
     GenComment(struct_def.doc_comment);
 
+    const auto native_name = NativeName(Name(struct_def), &struct_def, opts_);
+    code_.SetValue("NATIVE_NAME", native_name);
     code_.SetValue("STRUCT_NAME", Name(struct_def));
     code_ +=
         "struct {{STRUCT_NAME}} FLATBUFFERS_FINAL_CLASS"
@@ -3642,15 +3671,21 @@ class CppGenerator : public BaseGenerator {
 
   // Generate code for tables that needs to come after the regular definition.
   void GenTablePost(const StructDef &struct_def) {
-    if (opts_.generate_object_based_api) { GenNativeTablePost(struct_def); }
+    // Don't generate an object API struct for the table if it is a native type.
+    const auto native_type = struct_def.attributes.Lookup("native_type");
+    if (opts_.generate_object_based_api && !native_type) {
+      GenNativeTablePost(struct_def);
+    }
 
     code_.SetValue("STRUCT_NAME", Name(struct_def));
     code_.SetValue("NATIVE_NAME",
                    NativeName(Name(struct_def), &struct_def, opts_));
 
     if (opts_.generate_object_based_api) {
       // Generate the >= C++11 copy ctor and assignment operator definitions.
-      GenCopyCtorAssignOpDefs(struct_def);
+      if (!native_type) {
+        GenCopyCtorAssignOpDefs(struct_def);
+      }
 
       // Generate the X::UnPack() method.
       code_ +=
@@ -3673,31 +3708,36 @@ class CppGenerator : public BaseGenerator {
       code_ += "  return _o.release();";
       code_ += "}";
       code_ += "";
-      code_ +=
-          "inline " + TableUnPackToSignature(struct_def, false, opts_) + " {";
-      code_ += "  (void)_o;";
-      code_ += "  (void)_resolver;";
 
-      for (auto it = struct_def.fields.vec.begin();
-           it != struct_def.fields.vec.end(); ++it) {
-        const auto &field = **it;
-        if (field.deprecated) { continue; }
-
-        // Assign a value from |this| to |_o|.   Values from |this| are stored
-        // in a variable |_e| by calling this->field_type().  The value is then
-        // assigned to |_o| using the GenUnpackFieldStatement.
-        const bool is_union = field.value.type.base_type == BASE_TYPE_UTYPE;
-        const auto statement =
-            GenUnpackFieldStatement(field, is_union ? *(it + 1) : nullptr);
-
-        code_.SetValue("FIELD_NAME", Name(field));
-        auto prefix = "  { auto _e = {{FIELD_NAME}}(); ";
-        auto check = IsScalar(field.value.type.base_type) ? "" : "if (_e) ";
-        auto postfix = " }";
-        code_ += std::string(prefix) + check + statement + postfix;
+      // Generate an Unpack method for the C++ object if that table does not
+      // have a native type.
+      if (!native_type) {
+        code_ +=
+            "inline " + TableUnPackToSignature(struct_def, false, opts_) + " {";
+        code_ += "  (void)_o;";
+        code_ += "  (void)_resolver;";
+
+        for (auto it = struct_def.fields.vec.begin();
+             it != struct_def.fields.vec.end(); ++it) {
+          const auto &field = **it;
+          if (field.deprecated) { continue; }
+
+          // Assign a value from |this| to |_o|.   Values from |this| are stored
+          // in a variable |_e| by calling this->field_type().  The value is
+          // then assigned to |_o| using the GenUnpackFieldStatement.
+          const bool is_union = field.value.type.base_type == BASE_TYPE_UTYPE;
+          const auto statement =
+              GenUnpackFieldStatement(field, is_union ? *(it + 1) : nullptr);
+
+          code_.SetValue("FIELD_NAME", Name(field));
+          auto prefix = "  { auto _e = {{FIELD_NAME}}(); ";
+          auto check = IsScalar(field.value.type.base_type) ? "" : "if (_e) ";
+          auto postfix = " }";
+          code_ += std::string(prefix) + check + statement + postfix;
+        }
+        code_ += "}";
+        code_ += "";
       }
-      code_ += "}";
-      code_ += "";
 
       // Generate the X::Pack member function that simply calls the global
       // CreateX function.
@@ -3706,69 +3746,75 @@ class CppGenerator : public BaseGenerator {
       code_ += "}";
       code_ += "";
 
-      // Generate a CreateX method that works with an unpacked C++ object.
-      code_ +=
-          "inline " + TableCreateSignature(struct_def, false, opts_) + " {";
-      code_ += "  (void)_rehasher;";
-      code_ += "  (void)_o;";
-
-      code_ +=
-          "  struct _VectorArgs "
-          "{ " +
-          GetBuilder() +
-          " *__fbb; "
-          "const " +
-          NativeName(Name(struct_def), &struct_def, opts_) +
-          "* __o; "
-          "const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { "
-          "&_fbb, _o, _rehasher}; (void)_va;";
-
-      for (auto it = struct_def.fields.vec.begin();
-           it != struct_def.fields.vec.end(); ++it) {
-        auto &field = **it;
-        if (field.deprecated) { continue; }
-        if (IsVector(field.value.type)) {
-          const std::string force_align_code =
-              GenVectorForceAlign(field, "_o->" + Name(field) + ".size()");
-          if (!force_align_code.empty()) { code_ += "  " + force_align_code; }
-        }
-        code_ += "  auto _" + Name(field) + " = " + GenCreateParam(field) + ";";
-      }
-      // Need to call "Create" with the struct namespace.
-      const auto qualified_create_name =
-          struct_def.defined_namespace->GetFullyQualifiedName("Create");
-      code_.SetValue("CREATE_NAME", TranslateNameSpace(qualified_create_name));
-
-      code_ += "  return {{CREATE_NAME}}{{STRUCT_NAME}}(";
-      code_ += "      _fbb\\";
-      for (const auto &field : struct_def.fields.vec) {
-        if (field->deprecated) { continue; }
+      if (!native_type) {
+        // Generate a CreateX method that works with an unpacked C++ object if
+        // it does not have a native type.
+        code_ +=
+            "inline " + TableCreateSignature(struct_def, false, opts_) + " {";
+        code_ += "  (void)_rehasher;";
+        code_ += "  (void)_o;";
 
-        bool pass_by_address = false;
-        bool check_ptr = false;
-        if (field->value.type.base_type == BASE_TYPE_STRUCT) {
-          if (IsStruct(field->value.type)) {
-            auto native_type =
-                field->value.type.struct_def->attributes.Lookup("native_type");
-            auto native_inline = field->attributes.Lookup("native_inline");
-            if (native_type) { pass_by_address = true; }
-            if (native_type && !native_inline) { check_ptr = true; }
+        code_ +=
+            "  struct _VectorArgs "
+            "{ " +
+            GetBuilder() +
+            " *__fbb; "
+            "const " +
+            NativeName(Name(struct_def), &struct_def, opts_) +
+            "* __o; "
+            "const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { "
+            "&_fbb, _o, _rehasher}; (void)_va;";
+
+        for (auto it = struct_def.fields.vec.begin();
+             it != struct_def.fields.vec.end(); ++it) {
+          auto &field = **it;
+          if (field.deprecated) { continue; }
+          if (IsVector(field.value.type)) {
+            const std::string force_align_code =
+                GenVectorForceAlign(field, "_o->" + Name(field) + ".size()");
+            if (!force_align_code.empty()) { code_ += "  " + force_align_code; }
           }
+          code_ +=
+              "  auto _" + Name(field) + " = " + GenCreateParam(field) + ";";
         }
+        // Need to call "Create" with the struct namespace.
+        const auto qualified_create_name =
+            struct_def.defined_namespace->GetFullyQualifiedName("Create");
+        code_.SetValue("CREATE_NAME",
+                       TranslateNameSpace(qualified_create_name));
+
+        code_ += "  return {{CREATE_NAME}}{{STRUCT_NAME}}(";
+        code_ += "      _fbb\\";
+        for (const auto &field : struct_def.fields.vec) {
+          if (field->deprecated) { continue; }
+
+          bool pass_by_address = false;
+          bool check_ptr = false;
+          if (field->value.type.base_type == BASE_TYPE_STRUCT) {
+            if (IsStruct(field->value.type)) {
+              auto native_type =
+                  field->value.type.struct_def->attributes.Lookup(
+                      "native_type");
+              auto native_inline = field->attributes.Lookup("native_inline");
+              if (native_type) { pass_by_address = true; }
+              if (native_type && !native_inline) { check_ptr = true; }
+            }
+          }
 
-        // Call the CreateX function using values from |_o|.
-        if (pass_by_address && check_ptr) {
-          code_ += ",\n      _o->" + Name(*field) + " ? &_" + Name(*field) +
-                   " : nullptr\\";
-        } else if (pass_by_address) {
-          code_ += ",\n      &_" + Name(*field) + "\\";
-        } else {
-          code_ += ",\n      _" + Name(*field) + "\\";
+          // Call the CreateX function using values from |_o|.
+          if (pass_by_address && check_ptr) {
+            code_ += ",\n      _o->" + Name(*field) + " ? &_" + Name(*field) +
+                     " : nullptr\\";
+          } else if (pass_by_address) {
+            code_ += ",\n      &_" + Name(*field) + "\\";
+          } else {
+            code_ += ",\n      _" + Name(*field) + "\\";
+          }
         }
+        code_ += ");";
+        code_ += "}";
+        code_ += "";
       }
-      code_ += ");";
-      code_ += "}";
-      code_ += "";
     }
   }
 

tests/native_type_test.fbs

@@ -14,11 +14,19 @@ struct Vector3DAlt (native_type:"Native::Vector3D", native_type_pack_name:"Vecto
   c:float;
 }
 
+table Matrix (native_type:"Native::Matrix") {
+  rows:int32;
+  columns:int32;
+  values:[float];
+}
+
 table ApplicationData {
   vectors:[Vector3D];
   vectors_alt:[Vector3DAlt];
   position:Vector3D;
   position_inline:Vector3D (native_inline);
+  matrix:Matrix;
+  matrices:[Matrix];
 }
 
 root_type ApplicationData;