From 11753e7dcab9bc5f653966624b0bc6148adf922e Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Tue, 21 Jul 2026 07:48:27 +0200 Subject: [PATCH 1/2] Fix some warnings in generated code (#593) (#594) * Refs #25536. Add `f` for default values in float types. Signed-off-by: Miguel Company * Refs #25536. Remove unnecessary braces. Signed-off-by: Miguel Company * Refs #25536. Remove more unnecessary braces. Signed-off-by: Miguel Company * Refs #25536. Add braces for array types. Signed-off-by: Miguel Company --------- Signed-off-by: Miguel Company (cherry picked from commit 49cb136b3eb5f9050a100cae47b03d01abf18882) # Conflicts: # src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg # src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg --- .../fastcdr/idl/templates/FastCdrCommon.stg | 15 ++ .../idl/templates/TypesCdrAuxHeaderImpl.stg | 4 +- .../fastdds/idl/templates/eprosima.stg | 194 ++++++++++++++++++ 3 files changed, 211 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg index 12bc5f26..25bde910 100644 --- a/src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg +++ b/src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg @@ -59,3 +59,18 @@ member_array_cstring_destructor(ctx, name, loopvar, dims) ::= <<$if(rest(dims))$ { free(str); }$endif$>> +<<<<<<< HEAD +======= + +member_default_init(member) ::= <% +$if(member.annotationDefault)$ + {$member.annotationDefaultValue$$if(member.typecode.isType_5)$f$endif$} +$elseif(!member.annotationOptional && !member.annotationExternal)$ +$if(member.typecode.initialValue)$ + {$member.typecode.initialValue$} +$elseif(member.typecode.isBitsetType)$ + {} +$endif$ +$endif$ +%> +>>>>>>> 49cb136 (Fix some warnings in generated code (#593) (#594)) diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg index b02992fd..36609d93 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg @@ -170,12 +170,12 @@ eProsima_user_DllExport void deserialize( $struct.allMembers : { member | $if(member.annotationDefault)$ - data.$member.name$({$member.annotationDefaultValue$\}); + data.$member.name$($member.annotationDefaultValue$$if(member.typecode.isType_5)$f$endif$); $elseif(member.annotationOptional)$ data.$member.name$().reset(); $elseif(!member.annotationExternal)$ $if(member.typecode.initialValue)$ - data.$member.name$({$member.typecode.initialValue$\}); + data.$member.name$($with_braces_if_array(member, member.typecode.initialValue)$); $elseif(member.typecode.isStringType || member.typecode.isWStringType)$ data.$member.name$({\}); $endif$ diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg b/src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg index 335bf894..b8a81e66 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg @@ -52,3 +52,197 @@ bitset_inherit_copy_init(parent) ::= <<$parent.scopedname$(x)>> bitset_inherit_move_init(parent) ::= <<$parent.scopedname$(std::move(x))>> indexName(name, loopvar) ::= <<$name$[$loopvar$]>> +<<<<<<< HEAD +======= + +//{ IDL-parser templates +annotation(ctx, annotation) ::= <<>> + +array_declarator(ctx, array) ::= <<>> + +bitmask_type(ctx, parent, bitmask) ::= <<>> + +bitset_type(ctx, parent, bitset, extensions) ::= <<>> + +const_decl(ctx, parent, const, const_type) ::= << +$const_type$ +>> + +definition_list(definitions) ::= << +$definitions; separator="\n"$ +>> + +element_type(ctx, element, type_element, declarator) ::= <% +$type_element$ +$declarator$ +%> + +enum_type(ctx, parent, enum) ::= <<>> + +exception(ctx, parent, exception) ::= <<>> + +export_list(exports) ::= <% +$exports; separator="\n"$ +%> + +fwd_decl(ctx, parent, type) ::= <<>> + +interface(ctx, parent, interface, export_list) ::= << +$export_list$ +>> + +map_type(ctx, map, key_type, value_type) ::= <% +$key_type$ +$value_type$ +%> + +member_type(ctx, member, type_member, declarators) ::= <% +$type_member$ +$declarators$ +%> + +module(ctx, parent, module, definition_list) ::= <% +$definition_list$ +%> + +operation(ctx, parent, operation, param_list, operation_type) ::= <% +$operation_type$ +$param_list$ +%> + +param_list(parameters) ::= <<>> + +param(parameter, parameter_type) ::= <% +$parameter_type$ +%> + +sequence_type(ctx, sequence, type_sequence) ::= <% +$type_sequence$ +%> + +string_type(ctx, string) ::= <<>> + +struct_type(ctx, parent, struct, member_list) ::= <% +$member_list$ +%> + +typedef_decl(ctx, parent, typedefs, typedefs_type, declarator_type) ::= <% +$declarator_type$ +$typedefs_type$ +%> + +union_type(ctx, parent, union, extensions, switch_type) ::= <% +$switch_type$ +%> + +wide_string_type(ctx, wstring) ::= <<>> +//} + +//{ Fast DDS-Gen extensions +module_conversion(ctx, parent, modules, definition_list) ::= <% +$definition_list$ +%> +//} + +//{ Anonymous collections generator name +sequence_name(sequence) ::= <% +$if(sequence.contentTypeCode.primitive && !sequence.contentTypeCode.isEnumType && !sequence.contentTypeCode.isAliasType)$ +anonymous_sequence_$sequence.contentTypeCode.cppTypenameForTypeId$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ +$elseif (sequence.contentTypeCode.isStringType)$ +anonymous_sequence_$string_name(string=sequence.contentTypeCode)$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ +$elseif (sequence.contentTypeCode.isWStringType)$ +anonymous_sequence_$wstring_name(wstring=sequence.contentTypeCode)$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ +$elseif (sequence.contentTypeCode.isArrayType)$ +anonymous_sequence_$array_name(array=sequence.contentTypeCode)$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ +$elseif (sequence.contentTypeCode.isSequenceType)$ +anonymous_sequence_$sequence_name(sequence=sequence.contentTypeCode)$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ +$elseif (sequence.contentTypeCode.isMapType)$ +anonymous_sequence_$map_name(map=sequence.contentTypeCode)$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ +$else$ +anonymous_sequence_$sequence.contentTypeCode.CScopedname$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ +$endif$ +%> + +map_name(map) ::= <% +$if(map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.primitive && !map.valueTypeCode.isEnumType)$ +anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map.valueTypeCode.cppTypenameForTypeId$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isStringType)$ +anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$string_name(string=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isWStringType)$ +anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$wstring_name(wstring=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isArrayType)$ +anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$array_name(array=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isSequenceType)$ +anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$sequence_name(sequence=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isMapType)$ +anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map_name(map=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType)$ +anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif(map.keyTypeCode.isStringType && map.valueTypeCode.primitive && !map.valueTypeCode.isEnumType)$ +anonymous_map_$string_name(string=map.keyTypeCode)$_$map.valueTypeCode.cppTypenameForTypeId$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isStringType)$ +anonymous_map_$string_name(string=map.keyTypeCode)$_$string_name(string=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isWStringType)$ +anonymous_map_$string_name(string=map.keyTypeCode)$_$wstring_name(wstring=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isArrayType)$ +anonymous_map_$string_name(string=map.keyTypeCode)$_$array_name(array=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isSequenceType)$ +anonymous_map_$string_name(string=map.keyTypeCode)$_$sequence_name(sequence=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isMapType)$ +anonymous_map_$string_name(string=map.keyTypeCode)$_$map_name(map=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isStringType)$ +anonymous_map_$string_name(string=map.keyTypeCode)$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif(map.keyTypeCode.isWStringType && map.valueTypeCode.primitive && !map.valueTypeCode.isEnumType)$ +anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map.valueTypeCode.cppTypenameForTypeId$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isStringType)$ +anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$string_name(string=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isWStringType)$ +anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$wstring_name(wstring=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isArrayType)$ +anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$array_name(array=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isSequenceType)$ +anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$sequence_name(sequence=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isMapType)$ +anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map_name(map=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$elseif (map.keyTypeCode.isWStringType)$ +anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$else$ +anonymous_map_$map.keyTypeCode.CScopedname$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ +$endif$ +%> + +array_name(array) ::= <% +$if(array.contentTypeCode.primitive && !array.contentTypeCode.isEnumType)$ +anonymous_array_$array.contentTypeCode.cppTypenameForTypeId$$array.evaluatedDimensions : { dimension | _$dimension$}$ +$elseif (array.contentTypeCode.isStringType)$ +anonymous_array_$string_name(string=array.contentTypeCode)$$array.evaluatedDimensions : { dimension | _$dimension$}$ +$elseif (array.contentTypeCode.isWStringType)$ +anonymous_array_$wstring_name(wstring=array.contentTypeCode)$$array.evaluatedDimensions : { dimension | _$dimension$}$ +$elseif (array.contentTypeCode.isArrayType)$ +anonymous_array_$array_name(array=array.contentTypeCode)$$array.evaluatedDimensions : { dimension | _$dimension$}$ +$elseif (array.contentTypeCode.isSequenceType)$ +anonymous_array_$sequence_name(sequence=array.contentTypeCode)$$array.evaluatedDimensions : { dimension | _$dimension$}$ +$elseif (array.contentTypeCode.isMapType)$ +anonymous_array_$map_name(map=array.contentTypeCode)$$array.evaluatedDimensions : { dimension | _$dimension$}$ +$else$ +anonymous_array_$array.contentTypeCode.CScopedname$$array.evaluatedDimensions : { dimension | _$dimension$}$ +$endif$ +%> + +string_name(string) ::= << +anonymous_string_$if(string.isBounded)$$string.evaluatedMaxsize$$else$unbounded$endif$ +>> + +wstring_name(wstring) ::= << +anonymous_wstring_$if(wstring.isBounded)$$wstring.evaluatedMaxsize$$else$unbounded$endif$ +>> +//} + +with_braces_if_array(member, value) ::= <% +$if(member.typecode.isArrayType)$ +{$value$} +$else$ +$value$ +$endif$ +%> +>>>>>>> 49cb136 (Fix some warnings in generated code (#593) (#594)) From 9dc9b9e9f8e59d97b6ba2bb3a5f490e030f19817 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Tue, 21 Jul 2026 08:25:00 +0200 Subject: [PATCH 2/2] Fix conflicts Signed-off-by: Miguel Company --- .../fastcdr/idl/templates/FastCdrCommon.stg | 15 -- .../fastdds/idl/templates/eprosima.stg | 186 ------------------ 2 files changed, 201 deletions(-) diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg index 25bde910..12bc5f26 100644 --- a/src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg +++ b/src/main/java/com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg @@ -59,18 +59,3 @@ member_array_cstring_destructor(ctx, name, loopvar, dims) ::= <<$if(rest(dims))$ { free(str); }$endif$>> -<<<<<<< HEAD -======= - -member_default_init(member) ::= <% -$if(member.annotationDefault)$ - {$member.annotationDefaultValue$$if(member.typecode.isType_5)$f$endif$} -$elseif(!member.annotationOptional && !member.annotationExternal)$ -$if(member.typecode.initialValue)$ - {$member.typecode.initialValue$} -$elseif(member.typecode.isBitsetType)$ - {} -$endif$ -$endif$ -%> ->>>>>>> 49cb136 (Fix some warnings in generated code (#593) (#594)) diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg b/src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg index b8a81e66..61b0c493 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg @@ -52,191 +52,6 @@ bitset_inherit_copy_init(parent) ::= <<$parent.scopedname$(x)>> bitset_inherit_move_init(parent) ::= <<$parent.scopedname$(std::move(x))>> indexName(name, loopvar) ::= <<$name$[$loopvar$]>> -<<<<<<< HEAD -======= - -//{ IDL-parser templates -annotation(ctx, annotation) ::= <<>> - -array_declarator(ctx, array) ::= <<>> - -bitmask_type(ctx, parent, bitmask) ::= <<>> - -bitset_type(ctx, parent, bitset, extensions) ::= <<>> - -const_decl(ctx, parent, const, const_type) ::= << -$const_type$ ->> - -definition_list(definitions) ::= << -$definitions; separator="\n"$ ->> - -element_type(ctx, element, type_element, declarator) ::= <% -$type_element$ -$declarator$ -%> - -enum_type(ctx, parent, enum) ::= <<>> - -exception(ctx, parent, exception) ::= <<>> - -export_list(exports) ::= <% -$exports; separator="\n"$ -%> - -fwd_decl(ctx, parent, type) ::= <<>> - -interface(ctx, parent, interface, export_list) ::= << -$export_list$ ->> - -map_type(ctx, map, key_type, value_type) ::= <% -$key_type$ -$value_type$ -%> - -member_type(ctx, member, type_member, declarators) ::= <% -$type_member$ -$declarators$ -%> - -module(ctx, parent, module, definition_list) ::= <% -$definition_list$ -%> - -operation(ctx, parent, operation, param_list, operation_type) ::= <% -$operation_type$ -$param_list$ -%> - -param_list(parameters) ::= <<>> - -param(parameter, parameter_type) ::= <% -$parameter_type$ -%> - -sequence_type(ctx, sequence, type_sequence) ::= <% -$type_sequence$ -%> - -string_type(ctx, string) ::= <<>> - -struct_type(ctx, parent, struct, member_list) ::= <% -$member_list$ -%> - -typedef_decl(ctx, parent, typedefs, typedefs_type, declarator_type) ::= <% -$declarator_type$ -$typedefs_type$ -%> - -union_type(ctx, parent, union, extensions, switch_type) ::= <% -$switch_type$ -%> - -wide_string_type(ctx, wstring) ::= <<>> -//} - -//{ Fast DDS-Gen extensions -module_conversion(ctx, parent, modules, definition_list) ::= <% -$definition_list$ -%> -//} - -//{ Anonymous collections generator name -sequence_name(sequence) ::= <% -$if(sequence.contentTypeCode.primitive && !sequence.contentTypeCode.isEnumType && !sequence.contentTypeCode.isAliasType)$ -anonymous_sequence_$sequence.contentTypeCode.cppTypenameForTypeId$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ -$elseif (sequence.contentTypeCode.isStringType)$ -anonymous_sequence_$string_name(string=sequence.contentTypeCode)$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ -$elseif (sequence.contentTypeCode.isWStringType)$ -anonymous_sequence_$wstring_name(wstring=sequence.contentTypeCode)$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ -$elseif (sequence.contentTypeCode.isArrayType)$ -anonymous_sequence_$array_name(array=sequence.contentTypeCode)$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ -$elseif (sequence.contentTypeCode.isSequenceType)$ -anonymous_sequence_$sequence_name(sequence=sequence.contentTypeCode)$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ -$elseif (sequence.contentTypeCode.isMapType)$ -anonymous_sequence_$map_name(map=sequence.contentTypeCode)$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ -$else$ -anonymous_sequence_$sequence.contentTypeCode.CScopedname$_$if(sequence.unbound)$unbounded$else$$sequence.evaluatedMaxsize$$endif$ -$endif$ -%> - -map_name(map) ::= <% -$if(map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.primitive && !map.valueTypeCode.isEnumType)$ -anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map.valueTypeCode.cppTypenameForTypeId$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isStringType)$ -anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$string_name(string=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isWStringType)$ -anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$wstring_name(wstring=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isArrayType)$ -anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$array_name(array=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isSequenceType)$ -anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$sequence_name(sequence=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isMapType)$ -anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map_name(map=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType)$ -anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif(map.keyTypeCode.isStringType && map.valueTypeCode.primitive && !map.valueTypeCode.isEnumType)$ -anonymous_map_$string_name(string=map.keyTypeCode)$_$map.valueTypeCode.cppTypenameForTypeId$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isStringType)$ -anonymous_map_$string_name(string=map.keyTypeCode)$_$string_name(string=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isWStringType)$ -anonymous_map_$string_name(string=map.keyTypeCode)$_$wstring_name(wstring=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isArrayType)$ -anonymous_map_$string_name(string=map.keyTypeCode)$_$array_name(array=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isSequenceType)$ -anonymous_map_$string_name(string=map.keyTypeCode)$_$sequence_name(sequence=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isMapType)$ -anonymous_map_$string_name(string=map.keyTypeCode)$_$map_name(map=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isStringType)$ -anonymous_map_$string_name(string=map.keyTypeCode)$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif(map.keyTypeCode.isWStringType && map.valueTypeCode.primitive && !map.valueTypeCode.isEnumType)$ -anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map.valueTypeCode.cppTypenameForTypeId$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isStringType)$ -anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$string_name(string=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isWStringType)$ -anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$wstring_name(wstring=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isArrayType)$ -anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$array_name(array=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isSequenceType)$ -anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$sequence_name(sequence=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isMapType)$ -anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map_name(map=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$elseif (map.keyTypeCode.isWStringType)$ -anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$else$ -anonymous_map_$map.keyTypeCode.CScopedname$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$ -$endif$ -%> - -array_name(array) ::= <% -$if(array.contentTypeCode.primitive && !array.contentTypeCode.isEnumType)$ -anonymous_array_$array.contentTypeCode.cppTypenameForTypeId$$array.evaluatedDimensions : { dimension | _$dimension$}$ -$elseif (array.contentTypeCode.isStringType)$ -anonymous_array_$string_name(string=array.contentTypeCode)$$array.evaluatedDimensions : { dimension | _$dimension$}$ -$elseif (array.contentTypeCode.isWStringType)$ -anonymous_array_$wstring_name(wstring=array.contentTypeCode)$$array.evaluatedDimensions : { dimension | _$dimension$}$ -$elseif (array.contentTypeCode.isArrayType)$ -anonymous_array_$array_name(array=array.contentTypeCode)$$array.evaluatedDimensions : { dimension | _$dimension$}$ -$elseif (array.contentTypeCode.isSequenceType)$ -anonymous_array_$sequence_name(sequence=array.contentTypeCode)$$array.evaluatedDimensions : { dimension | _$dimension$}$ -$elseif (array.contentTypeCode.isMapType)$ -anonymous_array_$map_name(map=array.contentTypeCode)$$array.evaluatedDimensions : { dimension | _$dimension$}$ -$else$ -anonymous_array_$array.contentTypeCode.CScopedname$$array.evaluatedDimensions : { dimension | _$dimension$}$ -$endif$ -%> - -string_name(string) ::= << -anonymous_string_$if(string.isBounded)$$string.evaluatedMaxsize$$else$unbounded$endif$ ->> - -wstring_name(wstring) ::= << -anonymous_wstring_$if(wstring.isBounded)$$wstring.evaluatedMaxsize$$else$unbounded$endif$ ->> -//} with_braces_if_array(member, value) ::= <% $if(member.typecode.isArrayType)$ @@ -245,4 +60,3 @@ $else$ $value$ $endif$ %> ->>>>>>> 49cb136 (Fix some warnings in generated code (#593) (#594))