Skip to content

Commit 4e7f30f

Browse files
JLBuenoLopezJLBuenoLopez
committed
Fix bounded collections with unbounded elements (#295)
* Refs #20335: fix bounded collections with unbounded elements Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20335: update submodules Signed-off-by: JLBuenoLopez-eProsima <[email protected]> --------- Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
1 parent 165cbad commit 4e7f30f

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectSource.stg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ $plain_collection_header(type=sequence.contentTypeCode, message="Sequence elemen
562562
std::string type_id_kind_$sequence_name(sequence)$("$sequence.typeIdentifier$");
563563
if (type_id_kind_$sequence_name(sequence)$ == "TI_PLAIN_SEQUENCE_SMALL")
564564
{
565-
SBound bound = $if (!sequence.isBounded)$0$else$static_cast<SBound>($sequence.evaluatedMaxsize$)$endif$;
565+
SBound bound = $if (sequence.unbound)$0$else$static_cast<SBound>($sequence.evaluatedMaxsize$)$endif$;
566566
PlainSequenceSElemDefn seq_sdefn = TypeObjectUtils::build_plain_sequence_s_elem_defn(header_$sequence_name(sequence)$, bound,
567567
eprosima::fastcdr::external<TypeIdentifier>(element_identifier_$sequence_name(sequence)$));
568568
if (eprosima::fastdds::dds::RETCODE_BAD_PARAMETER ==
@@ -692,7 +692,7 @@ PlainCollectionHeader header_$map_name(map)$ = TypeObjectUtils::build_plain_coll
692692
std::string type_id_kind_$map_name(map)$("$map.typeIdentifier$");
693693
if (type_id_kind_$map_name(map)$ == "TI_PLAIN_MAP_SMALL")
694694
{
695-
SBound bound = $if (!map.isBounded)$0$else$static_cast<SBound>($map.evaluatedMaxsize$)$endif$;
695+
SBound bound = $if (map.unbound)$0$else$static_cast<SBound>($map.evaluatedMaxsize$)$endif$;
696696
PlainMapSTypeDefn map_sdefn = TypeObjectUtils::build_plain_map_s_type_defn(header_$map_name(map)$, bound,
697697
eprosima::fastcdr::external<TypeIdentifier>(element_identifier_$map_name(map)$), key_flags_$map_name(map)$,
698698
eprosima::fastcdr::external<TypeIdentifier>(key_identifier_$map_name(map)$));

‎src/main/java/com/eprosima/fastdds/idl/templates/eprosima.stg‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -163,49 +163,49 @@ $endif$
163163

164164
map_name(map) ::= <%
165165
$if(map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.primitive && !map.valueTypeCode.isEnumType)$
166-
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map.valueTypeCode.cppTypenameForTypeId$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
166+
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map.valueTypeCode.cppTypenameForTypeId$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
167167
$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isStringType)$
168-
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$string_name(string=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
168+
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$string_name(string=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
169169
$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isWStringType)$
170-
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$wstring_name(wstring=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
170+
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$wstring_name(wstring=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
171171
$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isArrayType)$
172-
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$array_name(array=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
172+
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$array_name(array=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
173173
$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isSequenceType)$
174-
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$sequence_name(sequence=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
174+
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$sequence_name(sequence=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
175175
$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType && map.valueTypeCode.isMapType)$
176-
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map_name(map=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
176+
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map_name(map=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
177177
$elseif (map.keyTypeCode.primitive && !map.keyTypeCode.isEnumType)$
178-
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map.valueTypeCode.CScopedname$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
178+
anonymous_map_$map.keyTypeCode.cppTypenameForTypeId$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
179179
$elseif(map.keyTypeCode.isStringType && map.valueTypeCode.primitive && !map.valueTypeCode.isEnumType)$
180-
anonymous_map_$string_name(string=map.keyTypeCode)$_$map.valueTypeCode.cppTypenameForTypeId$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
180+
anonymous_map_$string_name(string=map.keyTypeCode)$_$map.valueTypeCode.cppTypenameForTypeId$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
181181
$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isStringType)$
182-
anonymous_map_$string_name(string=map.keyTypeCode)$_$string_name(string=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
182+
anonymous_map_$string_name(string=map.keyTypeCode)$_$string_name(string=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
183183
$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isWStringType)$
184-
anonymous_map_$string_name(string=map.keyTypeCode)$_$wstring_name(wstring=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
184+
anonymous_map_$string_name(string=map.keyTypeCode)$_$wstring_name(wstring=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
185185
$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isArrayType)$
186-
anonymous_map_$string_name(string=map.keyTypeCode)$_$array_name(array=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
186+
anonymous_map_$string_name(string=map.keyTypeCode)$_$array_name(array=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
187187
$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isSequenceType)$
188-
anonymous_map_$string_name(string=map.keyTypeCode)$_$sequence_name(sequence=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
188+
anonymous_map_$string_name(string=map.keyTypeCode)$_$sequence_name(sequence=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
189189
$elseif (map.keyTypeCode.isStringType && map.valueTypeCode.isMapType)$
190-
anonymous_map_$string_name(string=map.keyTypeCode)$_$map_name(map=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
190+
anonymous_map_$string_name(string=map.keyTypeCode)$_$map_name(map=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
191191
$elseif (map.keyTypeCode.isStringType)$
192-
anonymous_map_$string_name(string=map.keyTypeCode)$_$map.valueTypeCode.CScopedname$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
192+
anonymous_map_$string_name(string=map.keyTypeCode)$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
193193
$elseif(map.keyTypeCode.isWStringType && map.valueTypeCode.primitive && !map.valueTypeCode.isEnumType)$
194-
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map.valueTypeCode.cppTypenameForTypeId$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
194+
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map.valueTypeCode.cppTypenameForTypeId$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
195195
$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isStringType)$
196-
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$string_name(string=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
196+
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$string_name(string=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
197197
$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isWStringType)$
198-
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$wstring_name(wstring=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
198+
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$wstring_name(wstring=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
199199
$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isArrayType)$
200-
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$array_name(array=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
200+
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$array_name(array=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
201201
$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isSequenceType)$
202-
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$sequence_name(sequence=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
202+
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$sequence_name(sequence=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
203203
$elseif (map.keyTypeCode.isWStringType && map.valueTypeCode.isMapType)$
204-
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map_name(map=map.valueTypeCode)$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
204+
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map_name(map=map.valueTypeCode)$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
205205
$elseif (map.keyTypeCode.isWStringType)$
206-
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map.valueTypeCode.CScopedname$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
206+
anonymous_map_$wstring_name(wstring=map.keyTypeCode)$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
207207
$else$
208-
anonymous_map_$map.keyTypeCode.CScopedname$_$map.valueTypeCode.CScopedname$_$if(map.isBounded)$$map.evaluatedMaxsize$$else$unbounded$endif$
208+
anonymous_map_$map.keyTypeCode.CScopedname$_$map.valueTypeCode.CScopedname$_$if(!map.unbound)$$map.evaluatedMaxsize$$else$unbounded$endif$
209209
$endif$
210210
%>
211211

‎thirdparty/idl-parser‎

0 commit comments

Comments
 (0)