Fix after rebase

Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Apr 1, 2024 · 061b090 · 061b090
1 parent 509b3d2
commit 061b090
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg
@@ -351,13 +351,17 @@ register_struct_type(struct) ::= <<
     $get_type_identifier(type=struct.inheritance, name=struct.name)$
     if (return_code_$struct.name$ != eprosima::fastdds::dds::RETCODE_OK)
     {
+        $if(struct.inheritance.isAliasType)$
+        $register_alias_type(alias=struct.inheritance, name=struct.name)$
+        $else$
         $register_struct_type(struct.inheritance)$
+        $endif$
     }
     $endif$
     $complete_type_detail(type=struct, type_kind=" Structure", name=struct.name)$
     CompleteStructHeader header_$struct.name$;
     $if (struct.inheritance)$
-    if (EK_COMPLETE == type_ids_$struct.name$.type_identifier1()._d() || TK_NONE == type_ids_$struct.name$.type_identifier1()._d())
+    if (EK_COMPLETE == type_ids_$struct.name$.type_identifier1()._d())
     {
         header_$struct.name$ = TypeObjectUtils::build_complete_struct_header(type_ids_$struct.name$.type_identifier1(), detail_$struct.name$);
     }

diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser
+3 −18		src/main/antlr/com/eprosima/idl/parser/grammar/IDL.g4
+2 −0		src/main/java/com/eprosima/idl/parser/tree/Inherits.java
+40 −4		src/main/java/com/eprosima/idl/parser/typecode/AliasTypeCode.java
+17 −12		src/main/java/com/eprosima/idl/parser/typecode/BitsetTypeCode.java
+1 −1		src/main/java/com/eprosima/idl/parser/typecode/EnumTypeCode.java
+28 −20		src/main/java/com/eprosima/idl/parser/typecode/StructTypeCode.java