Fix Issue #63

Author: Huang-Ming Huang

src/mfast/xml_parser/field_builder.cpp

@@ -28,6 +28,29 @@ class template_not_found_error : public fast_dynamic_error {
   }
 };
 
+#ifndef NDEBUG
+
+void print_node(const XMLElement *element, int indent)
+{
+  for (int i = 0; i < indent; ++i)
+    std::cout << " ";
+  std::cout << "node " << element->Name() ;
+  const XMLAttribute *attr = element->FirstAttribute();
+  while (attr) {
+    std::cout << " " << attr->Name() << "=" << attr->Value();
+    attr = attr->Next();
+  }
+  std::cout << "\n";
+
+  const XMLElement *elem = element->FirstChildElement();
+  while (elem){
+    print_node(elem, indent+4);
+    elem = elem->NextSiblingElement();
+  }
+}
+
+#endif
+
 const char *field_builder::name() const { return name_; }
 
 std::size_t field_builder::num_instructions() const {
@@ -525,7 +548,11 @@ struct tag_value;
 typedef boost::error_info<tag_value, std::string> value_info;
 
 void field_builder::visit(const enum_field_instruction *inst, void *) {
-  field_op fop(inst, content_element_, alloc());
+
+  const XMLElement *element = &this->element_;
+  if (!field_op::find_field_op_element(*element))
+    element = content_element_;
+  field_op fop(inst, element, alloc());
 
   const char **enum_element_names = inst->elements();
   uint64_t num_elements = inst->num_elements();

src/mfast/xml_parser/field_op.cpp

@@ -105,7 +105,7 @@ void field_op::set_init_value(const char *init_value_str,
 }
 
 const XMLElement *
-field_op::find_field_op_element(const XMLElement &element) const {
+field_op::find_field_op_element(const XMLElement &element) {
   static const char *field_op_names[] = {"constant",  "default", "copy",
                                          "increment", "delta",   "tail"};
 

src/mfast/xml_parser/field_op.h

@@ -61,6 +61,8 @@ class field_op {
 
   arena_allocator &alloc() { return *alloc_; }
 
+  static const XMLElement *find_field_op_element(const XMLElement &element);
+
 private:
   void set_init_value(const char *init_value_str,
                       const int32_field_instruction *) {
@@ -118,7 +120,6 @@ class field_op {
   void set_init_value(const char *init_value_str,
                       const byte_vector_field_instruction *);
 
-  const XMLElement *find_field_op_element(const XMLElement &element) const;
 
   void parse_field_op(const XMLElement &field_op_element,
                       arena_allocator &alloc);

tests/composite_type_test.cpp

@@ -166,6 +166,9 @@ TEST_CASE("test the operations of complex group_mref", "[test_complex_group]")
   person_mref.set_firstName().as("John");
   person_mref.set_lastName().as("Doe");
 
+  // testing enum field operator
+  REQUIRE(person_mref.get_discrete().instruction()->field_operator() == mfast::operator_copy);
+
   // testing the default value
   REQUIRE(person_mref.get_gender().is_female());
 

tests/test4.xml

@@ -50,7 +50,6 @@
       <element name="One" value="1"/>
       <element name="Three" value="3"/>
       <element name="Five" value="5"/>
-      <copy/>
     </enum>
   </define>
   <define name="Salary">
@@ -105,6 +104,7 @@
     <boolean name="married"/>
     <field name="discrete">
       <type name="DiscreteEnum"/>
+      <copy/>
     </field>
     <field name="salary">
       <type name="Salary"/>