Add generation of entity_properties type for enums

The absence of this function was causing problems with subroutines
where the generic version of this function was called, returning
the incorrect bit bound for the enums
Add unittests to check for generated properties and header insertion

Signed-off-by: Martijn Reicher <[email protected]>

Author: reicheratwork

src/ddscxx/include/org/eclipse/cyclonedds/core/cdr/entity_properties.hpp

@@ -255,11 +255,11 @@ entity_properties_t get_type_props() {
   static std::mutex mtx;
   static entity_properties_t props;
   static bool initialized = false;
+  std::lock_guard<std::mutex> lock(mtx);
 
   if (initialized)
     return props;
 
-  std::lock_guard<std::mutex> lock(mtx);
   props.clear();
   key_endpoint keylist;
   switch (sizeof(T)) {

src/ddscxx/tests/Regression.cpp

@@ -224,6 +224,35 @@ TEST_F(Regression, delimiters_bitmask)
   readwrite_test(s, s_bm1_bytes, xcdr_v2_stream(endianness::little_endian));
 }
 
+TEST_F(Regression, emumerators_properties)
+{
+  auto props = org::eclipse::cyclonedds::core::cdr::get_type_props<e1>();
+
+  EXPECT_EQ(props.e_ext, extensibility::ext_appendable);
+  EXPECT_EQ(props.e_bb, bb_8_bits);
+  EXPECT_TRUE(props.xtypes_necessary);
+  ASSERT_EQ(props.m_members_by_seq.size(), 1);
+  EXPECT_FALSE(bool(props.m_members_by_seq.front()));
+  ASSERT_EQ(props.m_members_by_id.size(), 1);
+  EXPECT_FALSE(bool(props.m_members_by_id.front()));
+  ASSERT_EQ(props.m_keys.size(), 1);
+  EXPECT_FALSE(bool(props.m_keys.front()));
+}
+
+TEST_F(Regression, delimiters_emumerators)
+{
+  bytes s_e1_bytes =
+  {
+    0x03, 0x00, 0x00, 0x00,  //s_e1.dheader(3)
+    0x03, 0x01, 0x02,  //s_e1.c
+  };
+
+  s_e1 s;
+  s.c({e1::e_3, e1::e_1, e1::e_2});
+
+  readwrite_test(s, s_e1_bytes, xcdr_v2_stream(endianness::little_endian));
+}
+
 TEST_F(Regression, arrays_in_union_case)
 {
   W w_a, w_b;

src/ddscxx/tests/data/RegressionModels.idl

@@ -119,4 +119,14 @@ struct s_bm1 {
 bm1 c[3];
 };
 
+@bit_bound(8) @appendable enum e1 {
+  e_0, e_1, e_2, e_3
+};
+
+typedef e1 e1_arr[3];
+
+struct s_e1 {
+e1_arr c;
+};
+
 };

src/idlcxx/src/streamers.c

@@ -682,7 +682,8 @@ generate_entity_properties(
 
   const char *opt = is_optional(decl) ? "true" : "false";
   if (idl_is_struct(type_spec)
-   || idl_is_union(type_spec)) {
+   || idl_is_union(type_spec)
+   || idl_is_enum(type_spec)) {
     char *type = NULL;
     if (IDL_PRINTA(&type, get_cpp11_fully_scoped_name, type_spec, streams->generator) < 0)
       return IDL_RETCODE_NO_MEMORY;
@@ -762,20 +763,6 @@ generate_entity_properties(
   IDL_ANY:
   IDL_LDOUBLE:*/
     }
-  } else if (idl_is_enum(type_spec)) {
-    const idl_enum_t *en = type_spec;
-    bb = "bb_32_bits";
-    if (en->bit_bound.annotation) {
-      if (en->bit_bound.value > 32) {
-        bb = "bb_64_bits";
-      } else if (en->bit_bound.value > 16) {
-        bb = "bb_32_bits";
-      } else if (en->bit_bound.value > 8) {
-        bb = "bb_16_bits";
-      } else {
-        bb = "bb_8_bits";
-      }
-    }
   } else if (idl_is_bitmask(type_spec)) {
     const idl_bitmask_t *bm = type_spec;
     bb = "bb_32_bits";
@@ -1102,10 +1089,10 @@ print_constructed_type_open(struct streams *streams, const idl_node_t *node)
     " {\n"
     "  static std::mutex mtx;\n"
     "  static entity_properties_t props;\n"
-    "  static bool initialized = false;\n\n"
+    "  static bool initialized = false;\n"
+    "  std::lock_guard<std::mutex> lock(mtx);\n\n"
     "  if (initialized)\n"
     "    return props;\n\n"
-    "  std::lock_guard<std::mutex> lock(mtx);\n"
     "  props.clear();\n"
     "  key_endpoint keylist;\n\n";
   static const char *sfmt =
@@ -1489,11 +1476,21 @@ process_enum(
   if (IDL_PRINTA(&fullname, get_cpp11_fully_scoped_name, _enum, gen) < 0)
     return IDL_RETCODE_NO_MEMORY;
 
-  static const char *fmt = "template<>\n"\
-                    "%s enum_conversion<%s>(uint32_t in)%s";
-
-  if (putf(&str->props, fmt, fullname, fullname, " {\n  switch (in) {\n")
-   || idl_fprintf(gen->header.handle, fmt, fullname, fullname, ";\n\n") < 0)
+  static const char *conv_func = "template<>\n"\
+                    "%s enum_conversion<%s>(uint32_t in)%s",
+                    *prop_func = "template<>\n"\
+                    "entity_properties_t get_type_props<%s>()%s",
+                    *prop_func_contents = " {\n"
+                    "entity_properties_t props;\n",
+                    *prop_func_close =
+                    "  props.m_members_by_seq.push_back(final_entry());\n"
+                    "  props.m_members_by_id.push_back(final_entry());\n"
+                    "  props.m_keys.push_back(final_entry());\n"
+                    "  return props;\n"
+                    "}\n\n";
+
+  if (putf(&str->props, conv_func, fullname, fullname, " {\n  switch (in) {\n")
+   || idl_fprintf(gen->header.handle, conv_func, fullname, fullname, ";\n\n") < 0)
     return IDL_RETCODE_NO_MEMORY;
 
   /*count the number of enumerators*/
@@ -1533,16 +1530,34 @@ process_enum(
     }
   }
 
+  //generate entity properties function for enums
+  uint16_t bb = 32;
+  if (_enum->bit_bound.annotation) {
+    if (_enum->bit_bound.value > 32)
+      bb = 64;
+    else if (_enum->bit_bound.value > 16)
+      bb = 32;
+    else if (_enum->bit_bound.value > 8)
+      bb = 16;
+    else
+      bb = 8;
+  }
+
+  if (putf(&str->props,"  }\n}\n\n") ||
+      putf(&str->props, prop_func, fullname, prop_func_contents) ||
+      idl_fprintf(gen->header.handle, prop_func, fullname, ";\n\n") < 0 ||
+      (_enum->extensibility.value != IDL_FINAL &&
+       putf(&str->props, "  props.e_ext = extensibility::%s;\n  props.xtypes_necessary = true;\n", _enum->extensibility.value == IDL_APPENDABLE ? "ext_appendable" : "ext_mutable")) ||
+      putf(&str->props, "  props.e_bb = bb_%"PRIu16"_bits;\n", bb) ||
+      putf(&str->props, prop_func_close)) {
+    ret = IDL_RETCODE_NO_MEMORY;
+  }
+
   /*cleanup*/
   if (already_encountered)
     free(already_encountered);
-  if (ret)
-    return ret;
 
-  if (putf(&str->props,"  }\n}\n\n"))
-    return IDL_RETCODE_NO_MEMORY;
-
-  return IDL_RETCODE_OK;
+  return ret;
 }
 
 idl_retcode_t