Skip to content

Commit b419068

Browse files
Acuadros95Acuadros95
authored
Release v2.0.1
2 parents 29c0b2c + 2b68016 commit b419068

File tree

7 files changed

+23
-22
lines changed

7 files changed

+23
-22
lines changed

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
apply plugin: 'java-library'
1616
apply plugin: 'eclipse' // Eclipse integration
1717

18-
version = '2.0.0'
18+
version = '2.0.1'
1919
description = 'Build script with all necessary tasks to compile and test MicroXRCEDDSGen'
2020

2121
repositories {
2222
mavenCentral()
2323
}
2424

2525
dependencies {
26-
implementation files('thirdparty/IDL-Parser/build/libs/idlparser-1.5.0.jar')
26+
implementation files('thirdparty/IDL-Parser/build/libs/idlparser-1.6.0.jar')
2727
testImplementation('org.junit.jupiter:junit-jupiter-api:5.5.2')
2828
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.5.2')
2929
}

‎src/main/java/com/eprosima/uxr/idl/grammar/Context.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class Context extends com.eprosima.idl.context.Context implements com.epr
2727
{
2828
public Context(String filename, String file, ArrayList<String> includePaths, boolean subscribercode, boolean publishercode)
2929
{
30-
super(filename, file, includePaths);
30+
super(file, includePaths);
3131
m_fileNameUpper = filename.toUpperCase();
3232
m_subscribercode = subscribercode;
3333
m_publishercode = publishercode;

‎src/main/resources/com/eprosima/uxr/idl/templates/SerializationSource.stg

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ topic->$name$_size = $typecode.maxsize$ / 2;
9393
$if(typecode.contentTypeCode.primitive)$
9494
memset(topic->$name$, rand(), topic->$name$_size * $typecode.contentTypeCode.size$);
9595
$else$
96-
for(int i = 0; i < topic->$name$_size; ++i)
96+
for(size_t i = 0; i < topic->$name$_size; ++i)
9797
{
9898
$member_assignment(typecode=typecode.contentTypeCode, name=indexName(name=name), originName=name)$
9999
}
@@ -109,12 +109,12 @@ for(int i$length(dimensions)$ = 0; i$length(dimensions)$ < sizeof(topic->$name$)
109109
$elseif(typecode.contentTypeCode.primitive)$
110110
memset(topic->$name$, rand(), sizeof(topic->$name$));
111111
$elseif(typecode.contentTypeCode.isType_d)$
112-
for(int i = 0; i < sizeof(topic->$name$) / $typecode.contentTypeCode.maxsize$; ++i)
112+
for(size_t i = 0; i < sizeof(topic->$name$) / $typecode.contentTypeCode.maxsize$; ++i)
113113
{
114114
$member_assignment(typecode=typecode.contentTypeCode, name=indexName(name=name), originName=name)$
115115
}
116116
$else$
117-
for(int i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
117+
for(size_t i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
118118
{
119119
$member_assignment(typecode=typecode.contentTypeCode, name=indexName(name=name), originName=name)$
120120
}
@@ -145,7 +145,7 @@ printf("$name$: ");
145145
$print_sequence(name)$
146146
$else$
147147
printf("$name$: \n");
148-
for(int i = 0; i < topic->$name$_size; ++i)
148+
for(size_t i = 0; i < topic->$name$_size; ++i)
149149
{
150150
$member_print(typecode=typecode.contentTypeCode, name=indexName(name=name), originName=name)$
151151
}
@@ -164,29 +164,29 @@ printf("$name$: ");
164164
$print_array(typecode=typecode, name=name)$
165165
$elseif(typecode.contentTypeCode.isType_d)$
166166
printf("$name$: \n");
167-
for(int i = 0; i < sizeof(topic->$name$) / $typecode.contentTypeCode.maxsize$; ++i)
167+
for(size_t i = 0; i < sizeof(topic->$name$) / $typecode.contentTypeCode.maxsize$; ++i)
168168
{
169169
$member_print(typecode=typecode.contentTypeCode, name=indexName(name=name), originName=name)$
170170
}
171171
$else$
172172
printf("$name$: \n");
173-
for(int i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
173+
for(size_t i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
174174
{
175175
$member_print(typecode=typecode.contentTypeCode, name=indexName(name=name), originName=name)$
176176
}
177177
$endif$
178178
>>
179179

180180
print_sequence(name) ::= <<
181-
for(int i = 0; i < topic->$name$_size; ++i)
181+
for(size_t i = 0; i < topic->$name$_size; ++i)
182182
{
183183
printf("%" PRIx64 " ", (uint64_t)topic->$name$[i]);
184184
}
185185
printf("\n");
186186
>>
187187

188188
print_array(typecode, name) ::= <<
189-
for(int i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
189+
for(size_t i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
190190
{
191191
printf("%" PRIx64 " ", (uint64_t)topic->$name$[i]);
192192
}

‎src/main/resources/com/eprosima/uxr/idl/templates/SerializationTestSource.stg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ int test$ctx.lastStructure.cScopedname$()
6565
printf("ucdrBuffer: \n");
6666
printf("length: %d\n", buffer_length);
6767
printf("data: ");
68-
for(int i = 0; i < buffer_length; ++i)
68+
for(size_t i = 0; i < buffer_length; ++i)
6969
{
7070
printf("%02X ", mb.init[i]);
7171
}

‎src/main/resources/com/eprosima/uxr/idl/templates/TypesSource.stg

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ $if(typecode.contentTypeCode.primitive)$
124124
success &= ucdr_serialize_sequence_$typecode.cTypename$(writer, topic->$name$, topic->$name$_size);
125125
$else$
126126
success &= ucdr_serialize_uint32_t(writer, topic->$name$_size);
127-
for(int i = 0; i < topic->$name$_size; ++i)
127+
for(size_t i = 0; i < topic->$name$_size; ++i)
128128
{
129129
$member_serialization(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name), originName=name)$
130130
}
@@ -140,12 +140,12 @@ for(int i$length(dimensions)$ = 0; i$length(dimensions)$ < sizeof(topic->$name$)
140140
$elseif(typecode.contentTypeCode.primitive)$
141141
success &= ucdr_serialize_array_$typecode.cTypename$(writer, topic->$name$, sizeof(topic->$name$) / sizeof($typecode.cTypename$));
142142
$elseif(typecode.contentTypeCode.isType_d)$
143-
for(int i = 0; i < sizeof(topic->$name$) / $typecode.contentTypeCode.maxsize$; ++i)
143+
for(size_t i = 0; i < sizeof(topic->$name$) / $typecode.contentTypeCode.maxsize$; ++i)
144144
{
145145
$member_serialization(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name), originName=originName)$
146146
}
147147
$else$
148-
for(int i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
148+
for(size_t i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
149149
{
150150
$member_serialization(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name), originName=originName)$
151151
}
@@ -182,7 +182,7 @@ if(topic->$name$_size > $typecode.maxsize$)
182182
}
183183
else
184184
{
185-
for(int i = 0; i < topic->$name$_size; ++i)
185+
for(size_t i = 0; i < topic->$name$_size; ++i)
186186
{
187187
$member_deserialization(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name), originName=name)$
188188
}
@@ -199,12 +199,12 @@ for(int i$length(dimensions)$ = 0; i$length(dimensions)$ < sizeof(topic->$name$)
199199
$elseif(typecode.contentTypeCode.primitive)$
200200
success &= ucdr_deserialize_array_$typecode.cTypename$(reader, topic->$name$, sizeof(topic->$name$) / sizeof($typecode.cTypename$));
201201
$elseif(typecode.contentTypeCode.isType_d)$
202-
for(int i = 0; i < sizeof(topic->$name$) / $typecode.contentTypeCode.maxsize$; ++i)
202+
for(size_t i = 0; i < sizeof(topic->$name$) / $typecode.contentTypeCode.maxsize$; ++i)
203203
{
204204
$member_deserialization(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name), originName=originName)$
205205
}
206206
$else$
207-
for(int i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
207+
for(size_t i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
208208
{
209209
$member_deserialization(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name), originName=originName)$
210210
}
@@ -233,7 +233,7 @@ size += ucdr_alignment(size, 4) + 4;
233233
$if(typecode.contentTypeCode.primitive)$
234234
size += ucdr_alignment(size, $typecode.contentTypeCode.size$) + topic->$name$_size * $typecode.contentTypeCode.size$;
235235
$else$
236-
for(int i = 0; i < topic->$name$_size; ++i)
236+
for(size_t i = 0; i < topic->$name$_size; ++i)
237237
{
238238
$member_size(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name), originName=name)$
239239
}
@@ -249,12 +249,12 @@ for(int i$length(dimensions)$ = 0; i$length(dimensions)$ < sizeof(topic->$name$)
249249
$elseif(typecode.contentTypeCode.primitive)$
250250
size += ucdr_alignment(size, $typecode.contentTypeCode.size$) + sizeof(topic->$name$);
251251
$elseif(typecode.contentTypeCode.isType_d)$
252-
for(int i = 0; i < sizeof(topic->$name$) / $typecode.contentTypeCode.maxsize$; ++i)
252+
for(size_t i = 0; i < sizeof(topic->$name$) / $typecode.contentTypeCode.maxsize$; ++i)
253253
{
254254
$member_size(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name), originName=originName)$
255255
}
256256
$else$
257-
for(int i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
257+
for(size_t i = 0; i < sizeof(topic->$name$) / sizeof($typecode.cTypename$); ++i)
258258
{
259259
$member_size(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name), originName=originName)$
260260
}

‎src/test/java/com/eprosima/uxr/integration/MicroXRCEDDSGenIntegrationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public void runTests()
6666
IDL.COVERAGE_COMPLEX,
6767
IDL.FORWARD_DECLS,
6868
IDL.NEW_FEATURES_4_2,
69+
IDL.ARRAY_MULTI_DIM,
6970
IDL.SEQUENCE_BASIC_IN_MODULE_TYPEDEF,
7071
IDL.SEQUENCE_CUSTOM_IN_MODULE_TYPEDEF,
7172
IDL.SEQUENCE_STRING_IN_MODULE_TYPEDEF,

‎thirdparty/IDL-Parser

0 commit comments

Comments
 (0)