Refs #23128: Fix enum members annotated using keyword notation

Signed-off-by: Carlosespicur <carlosespicur@proton.me>

Author: Carlosespicur

src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlGrammar.hpp

@@ -329,7 +329,9 @@ struct const_dcl : seq<kw_const, const_type, opt<ws>, identifier, equal_op, cons
 struct annotation_appl_param : seq<identifier, equal_op, const_expr> {};
 struct annotation_appl_params : sor<seq<annotation_appl_param, star<seq<comma, annotation_appl_param>>>, const_expr> {};
 struct annotation_begin : TAO_PEGTL_STRING("@"){};
-struct annotation_appl : seq<annotation_begin, scoped_name, opt<open_parentheses, annotation_appl_params, close_parentheses>> {};
+struct annotation_param_context_begin: open_parentheses {};
+struct annotation_param_context_end: close_parentheses {};
+struct annotation_appl : seq<annotation_begin, scoped_name, opt<annotation_param_context_begin, annotation_appl_params, annotation_param_context_end>> {};
 struct any_const_type : kw_any {};
 struct annotation_member_type : sor<const_type, any_const_type, scoped_name> {};
 struct annotation_member : seq<opt<ws>, annotation_member_type, opt<ws>, simple_declarator, opt<seq<kw_default, const_expr>>, semicolon> {};

src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlParser.hpp

@@ -362,15 +362,27 @@ struct action<identifier>
             }
             else
             {
-                state["enum_member_names"] += scoped_identifier_name + ";";
-
-                if (state.count("annotation_names") && !state["annotation_names"].empty())
+                if (state.count("parsing_annotation") && state["parsing_annotation"] == "true")
+                {
+                    // identifier is an annotation's name, and handled in action<scoped_name>. Do nothing
+                    return;
+                }
+                if (state.count("parsing_annotation_params") && state["parsing_annotation_params"] == "true")
+                {
+                    // identifier is an annotation's parameter name, and handled in action<annotation_appl_param>. Do nothing
+                    return;
+                }
+                else
                 {
-                    state["annotation_member_name"] = identifier_name;
-                    if (!ctx->annotations().update_pending_annotations(state))
+                    state["enum_member_names"] +=  scoped_identifier_name + ";";
+                    if (state.count("annotation_names") && !state["annotation_names"].empty())
                     {
-                        EPROSIMA_LOG_ERROR(IDLPARSER, "Error annotating enum member");
-                        return;
+                        state["annotation_member_name"] = identifier_name;
+                        if (!ctx->annotations().update_pending_annotations(state))
+                        {
+                            EPROSIMA_LOG_ERROR(IDLPARSER, "Error annotating enum member");
+                            return;
+                        }
                     }
                 }
             }
@@ -1901,7 +1913,7 @@ struct action<enum_dcl>
 
             if (RETCODE_OK != builder->add_member(member_descriptor))
             {
-                EPROSIMA_LOG_ERROR(IDLPARSER, "Error adding member to union: " << scoped_enum_name
+                EPROSIMA_LOG_ERROR(IDLPARSER, "Error adding member to enum: " << scoped_enum_name
                                                                                << ", member: " << member_name);
                 return;
             }
@@ -1995,7 +2007,6 @@ struct action<struct_def>
 
         }
         cleanup_guard{state, ctx};
-
         auto module = ctx->modules().current();
         const std::string scoped_struct_name = module->create_scoped_name(state["struct_name"]);
 
@@ -2703,6 +2714,36 @@ struct action<annotation_begin>
 
 };
 
+template<>
+struct action<annotation_param_context_begin>
+{
+    template<typename Input>
+    static void apply(
+            const Input& /*in*/,
+            Context* /*ctx*/,
+            std::map<std::string, std::string>& state,
+            std::vector<traits<DynamicData>::ref_type>& /*operands*/)
+    {
+        state["parsing_annotation_params"] = "true";
+    }
+};
+
+template<>
+struct action<annotation_param_context_end>
+{
+    template<typename Input>
+    static void apply(
+            const Input& /*in*/,
+            Context* /*ctx*/,
+            std::map<std::string, std::string>& state,
+            std::vector<traits<DynamicData>::ref_type>& /*operands*/)
+    {
+        assert(state.count("parsing_annotation_params"));
+        state.erase("parsing_annotation_params");
+    }
+};
+
+
 template<>
 struct action<annotation_appl_params>
 {