Add code changes to support the optional group for the encoder V2

Author: martinfantini

src/fast_type_gen/inl_gen.cpp

@@ -25,11 +25,13 @@ std::string get_properties_type(const Instruction *inst) {
 using namespace mfast;
 struct ext_cref_type_getter : mfast::field_instruction_visitor {
   std::stringstream out_;
+  bool is_group_type_ = false;
 
 public:
   ext_cref_type_getter() {}
 
   std::string get() { return out_.str(); }
+  bool group_type() { return is_group_type_; }
 
   virtual void visit(const int32_field_instruction *inst, void *) override {
     out_ << "ext_cref<int32_cref, " << get_operator_tag(inst) << ", "
@@ -83,6 +85,7 @@ struct ext_cref_type_getter : mfast::field_instruction_visitor {
   virtual void visit(const group_field_instruction *inst, void *) override {
     out_ << "ext_cref< " << codegen_base::cpp_name(inst)
          << "_cref,  group_type_tag, " << get_properties_type(inst) << ">";
+    is_group_type_ = true;
   }
 
   virtual void visit(const sequence_field_instruction *inst, void *) override;
@@ -132,6 +135,12 @@ std::string get_ext_cref_type(const field_instruction *inst) {
   return getter.get();
 }
 
+bool is_group_type(const field_instruction *inst) {
+  ext_cref_type_getter getter;
+  inst->accept(getter, nullptr);
+  return getter.group_type();
+}
+
 void ext_cref_type_getter::visit(const sequence_field_instruction *inst,
                                  void *) {
   const uint32_field_instruction *length_inst = inst->length_instruction();
@@ -473,9 +482,17 @@ void inl_gen::visit(const mfast::group_field_instruction *inst, void *pIndex) {
 
     for (std::size_t i = 0; i < inst->subinstructions().size(); ++i) {
       const field_instruction *subinst = inst->subinstructions()[i];
-      ;
-      out_ << "  visitor.visit(" << get_ext_cref_type(subinst) << " ((*this)["
-           << i << "]) );\n";
+
+      if (is_group_type(subinst) && subinst->optional())
+      {
+        out_ << "  {\n"
+            << "    " << get_ext_cref_type(subinst) << " ext_cref_group((*this)[" << i << "]);\n"
+            << "    ext_cref_group.set_group_present(this->field_storage(" << i << ")->is_present());\n"
+            << "    visitor.visit(ext_cref_group);\n"
+            << "  }\n";
+      }
+      else
+        out_ << "  visitor.visit(" << get_ext_cref_type(subinst) << " ((*this)[" << i << "]) );\n";
     }
 
     out_ << "}\n\n";
@@ -508,6 +525,7 @@ void inl_gen::visit(const mfast::group_field_instruction *inst, void *pIndex) {
 
     for (std::size_t i = 0; i < inst->subinstructions().size(); ++i) {
       const field_instruction *subinst = inst->subinstructions()[i];
+
       out_ << "  visitor.visit(" << get_ext_mref_type(subinst) << " ((*this)["
            << i << "]) );\n";
     }
@@ -662,7 +680,7 @@ void inl_gen::visit(const mfast::sequence_field_instruction *inst,
 
     for (std::size_t i = 0; i < inst->subinstructions().size(); ++i) {
       const field_instruction *subinst = inst->subinstructions()[i];
-      ;
+
       out_ << "  visitor.visit(" << get_ext_cref_type(subinst) << " ((*this)["
            << i << "]) );\n";
     }
@@ -677,7 +695,7 @@ void inl_gen::visit(const mfast::sequence_field_instruction *inst,
 
     for (std::size_t i = 0; i < inst->subinstructions().size(); ++i) {
       const field_instruction *subinst = inst->subinstructions()[i];
-      ;
+
       out_ << "  visitor.visit(" << get_ext_mref_type(subinst) << " ((*this)["
            << i << "]) );\n";
     }
@@ -791,9 +809,17 @@ void inl_gen::visit(const mfast::template_instruction *inst, void *) {
 
   for (std::size_t i = 0; i < inst->subinstructions().size(); ++i) {
     const field_instruction *subinst = inst->subinstructions()[i];
-    ;
-    out_ << "  visitor.visit(" << get_ext_cref_type(subinst) << " ((*this)["
-         << i << "]) );\n";
+
+    if (is_group_type(subinst) && subinst->optional())
+    {
+      out_ << "  {\n"
+          << "    " << get_ext_cref_type(subinst) << " ext_cref_group((*this)[" << i << "]);\n"
+          << "    ext_cref_group.set_group_present(this->field_storage(" << i << ")->is_present());\n"
+          << "    visitor.visit(ext_cref_group);\n"
+          << "  }\n";
+    }
+    else
+      out_ << "  visitor.visit(" << get_ext_cref_type(subinst) << " ((*this)[" << i << "]) );\n";
   }
 
   out_ << "}\n\n";
@@ -842,7 +868,7 @@ void inl_gen::visit(const mfast::template_instruction *inst, void *) {
 
   for (std::size_t i = 0; i < inst->subinstructions().size(); ++i) {
     const field_instruction *subinst = inst->subinstructions()[i];
-    ;
+
     out_ << "  visitor.visit(" << get_ext_mref_type(subinst) << " ((*this)["
          << i << "]) );\n";
   }

src/mfast/ext_ref.h

@@ -194,10 +194,13 @@ class ext_cref<BaseCRef, group_type_tag, Properties>
   explicit ext_cref(const field_cref &base) : base_(base) {}
   explicit ext_cref(const aggregate_cref &base) : base_(base) {}
   cref_type get() const { return base_; }
-  bool present() const { return !this->optional() || base_.present(); }
+  bool present() const { return !this->optional() || group_present_; }
+
+  void set_group_present(bool present) { group_present_ = present; }
 
 private:
   cref_type base_;
+  bool group_present_ = true;
 };
 
 template <typename Properties>
@@ -212,8 +215,11 @@ class ext_cref<nested_message_cref, group_type_tag, Properties>
   cref_type get() const { return cref_type(aggregate_cref(base_)[0]); }
   bool present() const { return !this->optional() || base_.present(); }
 
+  void set_group_present(bool present) { group_present_ = present; }
+
 private:
   field_cref base_;
+  bool group_present_ = true;
 };
 
 ///////////////////////////////////////////////////////////////

src/mfast/value_storage.h

@@ -107,6 +107,7 @@ union MFAST_EXPORT value_storage {
   void defined(bool v) { of_array.defined_bit_ = v; }
   bool is_empty() const { return of_array.len_ == 0; }
   void present(bool p) { of_array.len_ = p; }
+  bool is_present() const { return of_group.present_ == 1; }
   uint32_t array_length() const {
     return of_array.len_ == 0 ? 0 : of_array.len_ - 1;
   };