New argument -genapi [19958] (#261)

* Refs #19944. Initial -genapi Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #19944. Remove default templates Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #19944. Update scope when getting typecodes Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #19944. Fix compilation error Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #19944. Apply suggestions Signed-off-by: Ricardo González Moreno <[email protected]> --------- Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Nov 20, 2023 · c09a47b · c09a47b
1 parent 5b69944
commit c09a47b
Show file tree

Hide file tree

Showing 30 changed files with 460 additions and 1,960 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -25,8 +25,6 @@ on:
       - 'master'
 
   pull_request:
-    branches:
-      - 'master'
 
 jobs:
   ubuntu-build-test:

diff --git a/src/main/java/com/eprosima/fastcdr/idl/context/Context.java b/src/main/java/com/eprosima/fastcdr/idl/context/Context.java
@@ -41,8 +41,6 @@ public interface Context
 
     public boolean isGenerateTypeObject();
 
-    public boolean isGenerateTypesC();
-
     public boolean isGenerateTypesROS2();
 
     public boolean isCdr();

diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
@@ -118,10 +118,6 @@ $definition_list$
 } // namespace $module.name$
 >>
 
-definition_list(definitions) ::= <<
-$definitions; separator="\n"$
->>
-
 annotation(ctx, annotation) ::= <<
 namespace $annotation.name$ {
     $annotation.enums : { enum | $enum_type(ctx=ctx, parent=annotation, enum=enum)$}; separator="\n"$
@@ -146,27 +142,6 @@ public:
 };
 >>
 
-export_list(exports) ::= <<
-$exports; separator="\n"$
->>
-
-exception(ctx, parent, exception) ::= <<>>
-
-operation(ctx, parent, operation, param_list, operation_type) ::= <<
-
-$operation_type$
-$param_list$
-
->>
-
-param_list(parameters) ::= <<>>
-
-param(parameter, parameter_type) ::= <<
-
-$parameter_type$
-
->>
-
 const_decl(ctx, parent, const, const_type) ::= <<$const_type$$if(ctx.inScopedFile)$$if(const.parent)$$if(const.parent.isInterface)$static $endif$$endif$const $const.typeCode.cppTypename$ $const.name$$if(!const.parent)$ = $const.value$$elseif(!const.parent.isInterface)$ = $const.value$$elseif(!const.typeCode.isType_5)$$if(!const.typeCode.isType_6)$ = $const.value$$endif$$endif$;$endif$>>
 
 typedef_decl(ctx, parent, typedefs, typedefs_type, declarator_type) ::= <<
@@ -258,13 +233,6 @@ private:
 };
 >>
 
-member_type(ctx, member, type_member, declarators) ::= <<
-
-$type_member$
-$declarators$
-
->>
-
 union_type(ctx, parent, union, extensions, switch_type) ::= <<
 $switch_type$
 /*!
@@ -358,13 +326,6 @@ private:
 };
 >>
 
-element_type(ctx, element, type_element, declarator) ::= <<
-
-$type_element$
-$declarator$
-
->>
-
 bitset_type(ctx, parent, bitset, extensions) ::= <<
 /*!
  * @brief This class represents the structure $bitset.name$ defined by the user in the IDL file.
@@ -471,25 +432,6 @@ class $type.name$;
 
 >>
 
-sequence_type(ctx, sequence, type_sequence) ::= <<
-
-$type_sequence$
-
->>
-
-map_type(ctx, map, key_type, value_type) ::= <<
-
-$key_type$
-$value_type$
-
->>
-
-string_type(ctx, string) ::= <<>>
-
-wide_string_type(ctx, wstring) ::= <<>>
-
-array_declarator(ctx, array, array_type) ::= <<>>
-
 /***** Utils *****/
 
 public_struct_inheritances(parent) ::= <<$parent.scopedname$>>
@@ -801,3 +743,17 @@ private:
     void free_memory();
 };
 >>
+
+//{ Fast DDS-Gen extensions
+module_conversion(ctx, parent, modules, definition_list) ::= <<
+$modules : { module |
+namespace $module.name$ {
+}; separator="\n"$
+
+$definition_list$
+
+$reverse(modules) : { module |
+\} // namespace $module.name$
+}; separator="\n"$
+>>
+//}
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeaderv1.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeaderv1.stg
@@ -103,17 +103,12 @@ $if(ctx.cdr_both)$
 $endif$
 >>
 
-// TODO name -> module
 module(ctx, parent, module, definition_list) ::= <<
 namespace $module.name$ {
     $definition_list$
 } // namespace $module.name$
 >>
 
-definition_list(definitions) ::= <<
-$definitions; separator="\n"$
->>
-
 annotation(ctx, annotation) ::= <<
 namespace $annotation.name$ {
     $annotation.enums : { enum | $enum_type(ctx=ctx, parent=annotation, enum=enum)$}; separator="\n"$
@@ -138,10 +133,6 @@ public:
 };
 >>
 
-export_list(exports) ::= <<
-$exports; separator="\n"$
->>
-
 exception(ctx, parent, exception) ::= <<
 $if(ctx.printexception)$
 /*!
@@ -210,10 +201,6 @@ virtual $paramRetType(operation.rettype)$ $operation.name$($paramDeclarations(pa
 $endif$
 >>
 
-param_list(parameters) ::= <<>>
-
-param(parameter) ::= <<>>
-
 const_decl(ctx, parent, const, const_type) ::= <<
 $ctx.setCdrv1Templates$
 $const_type$
@@ -556,39 +543,6 @@ enum $bitmask.name$Bits$bitmask.boundType$
 typedef $bitmask.castingType$ $bitmask.name$;
 >>
 
-sequence_type(ctx, sequence, type_sequence) ::= <<
-
-$type_sequence$
-
->>
-
-map_type(ctx, map, key_type, value_type) ::= <<
-
-$key_type$
-$value_type$
-
->>
-
-string_type(ctx, string) ::= <<>>
-
-wide_string_type(ctx, wstring) ::= <<>>
-
-array_declarator(ctx, array, array_type) ::= <<>>
-
-member_type(ctx, member, type_member, declarators) ::= <<
-
-$type_member$
-$declarators$
-
->>
-
-element_type(ctx, element, type_element, declarator) ::= <<
-
-$type_element$
-$declarator$
-
->>
-
 /***** Utils *****/
 
 public_struct_inheritances(parent) ::= <<$parent.scopedname$>>
@@ -950,3 +904,17 @@ private:
     void free_memory();
 };
 >>
+
+//{ Fast DDS-Gen extensions
+module_conversion(ctx, parent, modules, definition_list) ::= <<
+$modules : { module |
+namespace $module.name$ {
+}; separator="\n"$
+
+$definition_list$
+
+$reverse(modules) : { module |
+\} // namespace $module.name$
+}; separator="\n"$
+>>
+//}
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSource.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesSource.stg
@@ -77,39 +77,6 @@ $definition_list$
 } // namespace $module.name$
 >>
 
-definition_list(definitions) ::= <<
-$definitions; separator="\n"$
-
->>
-
-annotation(ctx, annotation) ::= <<>>
-
-interface(ctx, parent, interface, export_list) ::= <<
-$export_list$
->>
-
-export_list(exports) ::= <<
-$exports; separator="\n"$
-
->>
-
-exception(ctx, parent, exception) ::= <<>>
-
-operation(ctx, parent, operation, param_list, operation_type) ::= <<
-
-$operation_type$
-$param_list$
-
->>
-
-param_list(parameters) ::= <<>>
-
-param(parameter, parameter_type) ::= <<
-
-$parameter_type$
-
->>
-
 const_decl(ctx, parent, const, const_type) ::= <<
 $const_type$
 $if(const.parent)$
@@ -123,8 +90,6 @@ $endif$
 $endif$
 >>
 
-fwd_decl(ctx, parent, type) ::= <<>>
-
 typedef_decl(ctx, parent, typedefs, typedefs_type, declarator_type) ::= <<
 $declarator_type$
 $typedefs_type$
@@ -257,13 +222,6 @@ $struct.members:{ member | $public_member_declaration(class=struct.name, member=
 $extensions : { extension | $extension$}; separator="\n"$
 >>
 
-member_type(ctx, member, type_member, declarators) ::= <<
-
-$type_member$
-$declarators$
-
->>
-
 bitset_type(ctx, parent, bitset) ::= <<
 $bitset.name$::$bitset.name$()$if(bitset.inheritance)$
     : $bitset_inherit_default_init(bitset.inheritance)$$endif$
@@ -571,36 +529,6 @@ void $union.name$::deserialize(
 $endif$
 >>
 
-element_type(ctx, element, type_element, declarator) ::= <<
-
-$type_element$
-$declarator$
-
->>
-
-enum_type(ctx, parent, enum) ::= <<>>
-
-bitmask_type(ctx, parent, bitmask) ::= <<>>
-
-sequence_type(ctx, sequence, type_sequence) ::= <<
-
-$type_sequence$
-
->>
-
-map_type(ctx, map, key_type, value_type) ::= <<
-
-$key_type$
-$value_type$
-
->>
-
-string_type(ctx, string) ::= <<>>
-
-wide_string_type(ctx, wstring) ::= <<>>
-
-array_declarator(ctx, array, array_type) ::= <<>>
-
 /***** Utils *****/
 
 public_member_declaration(class, member) ::= <<
@@ -1411,3 +1339,17 @@ void $scopedtypename$::free_memory()
 
 $endif$
 >>
+
+//{ Fast DDS-Gen extensions
+module_conversion(ctx, parent, modules, definition_list) ::= <<
+$modules : { module |
+namespace $module.name$ {
+}; separator="\n"$
+
+$definition_list$
+
+$reverse(modules) : { module |
+\} // namespace $module.name$
+}; separator="\n"$
+>>
+//}