Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[19680] Enable -Wall, fix build warnings and fix regression #246

Merged
merged 13 commits into from
Oct 9, 2023
Merged

[19680] Enable -Wall, fix build warnings and fix regression #246

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
20518c6
Refs #19676: enable compilation warnings
JLBuenoLopez Oct 6, 2023
8821bae
Refs #19676: fix regression test: use const value defined within a mo…
JLBuenoLopez Oct 6, 2023
ce2f9c1
Refs #19676: remove unused parameter warning
JLBuenoLopez Oct 6, 2023
06d6d1a
Refs #19676: %S is not supported in C++11
JLBuenoLopez Oct 6, 2023
454741d
Refs #19676: remove comparison warning
JLBuenoLopez Oct 6, 2023
0af6355
Refs #19676: remove warning about variable set but unused
JLBuenoLopez Oct 6, 2023
241e556
Refs #19676: update IDL parser to fail test if there are build warnings
JLBuenoLopez Oct 6, 2023
6b5ee60
Refs #19676: disable switch-bool warning
JLBuenoLopez Oct 6, 2023
e02dc18
Refs #19676: fix non contemplated enum value
JLBuenoLopez Oct 6, 2023
c30dfd7
Refs #19676: update submodule DDS Test Types
JLBuenoLopez Oct 6, 2023
6b48d59
Refs #19676: update IDL Parser submodule
JLBuenoLopez Oct 9, 2023
c1619ee
Refs #19676: apply review suggestions
JLBuenoLopez Oct 9, 2023
148c361
Refs #19680: apply review suggestion
JLBuenoLopez Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 26 additions & 1 deletion src/main/java/com/eprosima/fastcdr/idl/templates/TypesSource.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,11 @@ $struct.scopedname$::$struct.name$(
$endif$

{
$if(struct.members)$
$struct.members:{ member | $member_copy(ctx=ctx, member=member)$}; separator="\n"$
$else$
static_cast<void>(x);
$endif$
}

$struct.scopedname$::$struct.name$(
Expand All @@ -150,15 +154,23 @@ $struct.scopedname$::$struct.name$(
$endif$

{
$if(struct.members)$
$struct.members:{ member | $member_move(member=member)$}; separator="\n"$
$else$
static_cast<void>(x);
$endif$
}

$struct.scopedname$& $struct.scopedname$::operator =(
const $struct.name$& x)
{
$if(struct.inheritances)$$struct.inheritances : { inheritance | $inheritance.scopedname$::operator =(x);}; separator="\n"$$endif$

$if(struct.members)$
$struct.members:{ member | $member_copy(ctx=ctx, member=member)$}; separator="\n"$
$else$
static_cast<void>(x);
$endif$

return *this;
}
Expand All @@ -168,7 +180,11 @@ $struct.scopedname$& $struct.scopedname$::operator =(
{
$if(struct.inheritances)$$struct.inheritances : { inheritance | $inheritance.scopedname$::operator =(std::move(x));}; separator="\n"$$endif$

$if(struct.members)$
$struct.members:{ member | $member_move(member=member)$}; separator="\n"$
$else$
static_cast<void>(x);
$endif$

return *this;
}
Expand All @@ -182,7 +198,12 @@ bool $struct.scopedname$::operator ==(
\}
}; separator="\n"$$endif$

return $if(struct.members)$($struct.members:{ member | m_$member.name$ == x.m_$member.name$}; separator=" &&\n "$)$else$true$endif$;
$if(!struct.members)$
static_cast<void>(x);
return true;
$else$
return ($struct.members:{ member | m_$member.name$ == x.m_$member.name$}; separator=" &&\n "$);
$endif$
}

bool $struct.scopedname$::operator !=(
Expand Down Expand Up @@ -467,6 +488,10 @@ void $union.scopedname$::_d(
switch (m__d)
{
$union.members:{ member | $unionmember_discriminator_case(member=member, totallabels=union.totallabels)$}; separator="\n"$
$if(!union.defaultMember)$
default:
break;
$endif$
}

if (!b)
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/com/eprosima/fastdds/idl/templates/CMakeLists.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,18 @@ project("generated_code")
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS OFF)

if(NOT MSVC OR NOT MSVC_IDE)
richiware marked this conversation as resolved.
Show resolved Hide resolved
set(CMAKE_CXX_FLAGS
"\${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Wno-unknown-pragmas -Wno-error=deprecated-declarations -Wno-switch-bool")
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -Wno-psabi")
set(CMAKE_SHARED_LINKER_FLAGS "\${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -Wno-deprecated-builtins")
set(CMAKE_SHARED_LINKER_FLAGS "\${CMAKE_SHARED_LINKER_FLAGS} -Wl")
endif()
endif()

# Find requirements
find_package(fastcdr 2 REQUIRED)
find_package(fastrtps 2.12 REQUIRED)
Expand Down
58 changes: 37 additions & 21 deletions src/main/java/com/eprosima/fastdds/idl/templates/SerializationSource.stg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ $endif$
void $if(struct.hasScope)$$struct.scope$::$endif$print$struct.name$(
$struct.name$* topic)
{
$if(!struct.allMembers)$
static_cast<void>(topic);
$endif$
printf("$struct.name$: { \n");
$struct.allMembers:{ member |
$member_print(ctx=ctx, typecode=member.typecode, name=member.name, originName=member.name, optional=member.annotationOptional)$
Expand All @@ -61,6 +64,7 @@ void $if(struct.hasScope)$$struct.scope$::$endif$initialize$struct.name$(
$struct.name$* topic,
int idx)
{
$if(struct.allMembers)$
if (idx == 0)
{
$struct.allMembers:{ member |
Expand All @@ -87,12 +91,20 @@ void $if(struct.hasScope)$$struct.scope$::$endif$initialize$struct.name$(
$endif$
}; separator="\n"$
}
$else$
static_cast<void>(topic);
static_cast<void>(idx);
$endif$
}

int $if(struct.hasScope)$$struct.scope$::$endif$compare$struct.name$(
$struct.name$* topic_a,
$struct.name$* topic_b)
{
$if(!struct.allMembers)$
static_cast<void>(topic_a);
static_cast<void>(topic_b);
$endif$
$struct.allMembers:{ member |
$member_comparision(ctx=ctx, typecode=member.typecode, name=member.name, originName=member.name, optional=member.annotationOptional)$
}; separator="\n"$
Expand Down Expand Up @@ -488,7 +500,7 @@ for(size_t $loopvar$ = 0; $if(typecode.contentTypeCode.forwarded)$!$name$_detect
>>

map_assigment(ctx, typecode, name, originName, p, loopvar) ::= <<
for(int $loopvar$ = 0; $loopvar$ < $typecode.maxsize$; ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < $typecode.maxsize$; ++$loopvar$)
richiware marked this conversation as resolved.
Show resolved Hide resolved
{
$if(typecode.valueTypeCode.isSequenceType)$
$map_member_assignment(ctx=ctx, keytypecode=typecode.keyTypeCode, valueTypeCode=typecode.valueTypeCode, name=name, originName=originName, p=p, loopvar=ctx.nextLoopVarName)$
Expand All @@ -504,24 +516,24 @@ for(int $loopvar$ = 0; $loopvar$ < $typecode.maxsize$; ++$loopvar$)

array_assigment(ctx, typecode, name, originName, dimensions, p, loopvar) ::= <<
$if(rest(dimensions))$
for(int $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
{
$array_assigment(ctx=ctx, typecode=typecode, name=indexName(name=name, p=p, loopvar=loopvar), originName=originName, dimensions=rest(dimensions), p="", loopvar=ctx.nextLoopVarName)$
}
$elseif(typecode.isType_f)$
for(int $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
{
$array_member_assignment(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name, p=p, loopvar=loopvar), originName=name, loopvar=ctx.nextLoopVarName)$
}
$elseif(typecode.contentTypeCode.primitive)$
memset(&topic->$name$$p$, static_cast<$typecode.contentTypeCode.cppTypename$>(rand()), sizeof(topic->$name$$p$));
$elseif(typecode.contentTypeCode.isType_d)$
for(int $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
{
$array_member_assignment(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name, p=p, loopvar=loopvar), originName=name, loopvar=ctx.nextLoopVarName)$
}
$else$
for(int $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
{
$array_member_assignment(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name, p=p, loopvar=loopvar), originName=name, loopvar=ctx.nextLoopVarName)$
}
Expand All @@ -544,7 +556,7 @@ $elseif(typecode.isBitsetType)$
printf("$name$: %s\n", topic->$name$()$if(optional)$.value()$endif$.bitset().to_string().c_str());
$elseif(typecode.isType_d)$
$if(typecode.isWStringType)$
printf("$name$: %S\n", topic->$name$()$if(optional)$.value()$endif$.c_str());
printf("$name$: %ls\n", topic->$name$()$if(optional)$.value()$endif$.c_str());
$elseif(ctx.generateTypesC)$
printf("$name$: %s\n", topic->$name$()$if(optional)$.value()$endif$);
$else$
Expand Down Expand Up @@ -574,7 +586,7 @@ $elseif(typecode.isBitsetType)$
printf("$name$: %s\n", topic->$name$.bitset().to_string().c_str());
$elseif(typecode.isType_d)$
$if(typecode.isWStringType)$
printf("$name$: %S\n", topic->$name$.c_str());
printf("$name$: %ls\n", topic->$name$.c_str());
$elseif(ctx.generateTypesC)$
printf("$name$: %s\n", topic->$name$);
$else$
Expand All @@ -601,7 +613,7 @@ $elseif(typecode.isBitsetType)$
printf("$name$: %s\n", topic->$name$.bitset().to_string().c_str());
$elseif(typecode.valueTypeCode.isType_d)$
$if(typecode.valueTypeCode.isWStringType)$
printf("$name$: %S\n", topic->$name$.c_str());
printf("$name$: %ls\n", topic->$name$.c_str());
$elseif(ctx.generateTypesC)$
printf("$name$: %s\n", topic->$name$());
$else$
Expand All @@ -626,7 +638,7 @@ $if(typecode.contentTypeCode.primitive)$
printf("$name$: ");
$print_sequence(name=name, p=p, loopvar=loopvar)$
$elseif(typecode.contentTypeCode.isType_10)$
for(int $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
{
$array_member_print(ctx=ctx, typecode=typecode.contentTypeCode.typedefContentTypeCode, name=indexName(name=name, p=p, loopvar=loopvar), originName=originName, loopvar=ctx.nextLoopVarName)$
}
Expand All @@ -636,7 +648,7 @@ $map_print(ctx=ctx, typecode=typecode.contentTypeCode, name=name, originName=ori

$else$
printf("$name$: \n");
for(int $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
{
$if(ctx.generateTypesC)$
$array_member_print(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name, p=[p, ".value()"], loopvar=loopvar), originName=originName, loopvar=ctx.nextLoopVarName)$
Expand Down Expand Up @@ -664,7 +676,7 @@ for (auto it_$loopvar$ : topic->$name$$p$)
map_key_print(ctx, typecode, name, originName, p, loopvar) ::= <<
$if(typecode.isType_d)$
$if(typecode.isWStringType)$
printf("[%S]", (it_$loopvar$.first).c_str());
printf("[%ls]", (it_$loopvar$.first).c_str());
$elseif(ctx.generateTypesC)$
printf("[%s]", (it_$loopvar$.first));
$else$
Expand All @@ -679,16 +691,18 @@ $array_print(ctx=ctx, typecode=typecode, name=name, originName=originName, dimen
$elseif(typecode.isType_10)$
$map_key_print(ctx=ctx, typecode=typecode.contentTypeCode, name=name, originName=originName, p="", loopvar=loopvar)$
$elseif(typecode.primitive)$
static_cast<void>(it_$loopvar$);
printf("[$typecode$]");
$else$
static_cast<void>(it_$loopvar$);
printf("[$typecode$]");
$endif$
>>

map_value_print(ctx, typecode, name, originName, p, loopvar) ::= <<
$if(typecode.isType_d)$
$if(typecode.isWStringType)$
printf("[%S]", (topic->$name$$p$).c_str());
printf("[%ls]", (topic->$name$$p$).c_str());
$elseif(ctx.generateTypesC)$
printf("[%s]", (topic->$name$$p$));
$else$
Expand All @@ -704,16 +718,18 @@ $array_print(ctx=ctx, typecode=typecode, name=name, originName=originName, dimen
$elseif(typecode.isType_10)$
$map_value_print(ctx=ctx, typecode=typecode.contentTypeCode, name=name, originName=originName, p="", loopvar=loopvar)$
$elseif(typecode.primitive)$
static_cast<void>(it_$loopvar$);
printf("[$typecode$]");
$else$
static_cast<void>(it_$loopvar$);
printf("[$typecode$]");
$endif$
>>

array_print(ctx, typecode, name, originName, dimensions, p, loopvar) ::= <<
$if(rest(dimensions))$
printf("$name$: \n");
for(int $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
{
$array_print(ctx=ctx, typecode=typecode, name=indexName(name=name, p=p, loopvar=loopvar), originName=originName, dimensions=rest(dimensions), p="", loopvar=ctx.nextLoopVarName)$
}
Expand All @@ -722,7 +738,7 @@ printf("$name$: ");
$print_array(name=name, p=p, loopvar=loopvar)$
$elseif(typecode.contentTypeCode.isType_d)$
printf("$name$: \n");
for(int $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
{
$array_member_print(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name, p=p, loopvar=loopvar), originName=originName, loopvar=ctx.nextLoopVarName)$
}
Expand All @@ -732,23 +748,23 @@ $map_print(ctx=ctx, typecode=typecode, name=name, originName=originName, p="", l

$else$
printf("$name$: \n");
for(int $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
{
$array_member_print(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name, p=p, loopvar=loopvar), originName=originName, loopvar=ctx.nextLoopVarName)$
}
$endif$
>>

print_sequence(name, p, loopvar) ::= <<
for(int $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
{
printf("%" PRIx64 " ", (uint64_t)topic->$name$$p$$if(ctx.generateTypesC)$.value()$endif$[$loopvar$]);
}
printf("\n");
>>

print_array(name, p, loopvar) ::= <<
for(int $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic->$name$$p$.size(); ++$loopvar$)
{
printf("%" PRIx64 " ", (uint64_t)topic->$name$$p$[$loopvar$]);
}
Expand Down Expand Up @@ -881,7 +897,7 @@ $endif$
>>

sequence_comparision(ctx, typecode, name, p, loopvar) ::= <<
for(int $loopvar$ = 0; $loopvar$ < topic_a->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic_a->$name$$p$.size(); ++$loopvar$)
{
$if(ctx.generateTypesC)$
$array_member_comparision(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name, p=[p, ".value()"], loopvar=loopvar), originName=originName, loopvar=ctx.nextLoopVarName)$
Expand All @@ -900,19 +916,19 @@ for(auto it_$loopvar$ : topic_a->$name$$p$)

array_comparision(ctx, typecode, name, originName, dimensions, p, loopvar) ::= <<
$if(rest(dimensions))$
for(int $loopvar$ = 0; $loopvar$ < topic_a->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic_a->$name$$p$.size(); ++$loopvar$)
{
$array_comparision(ctx=ctx, typecode=typecode, name=indexName(name=name, loopvar=loopvar, p=p), originName=originName, dimensions=rest(dimensions), p="", loopvar=ctx.nextLoopVarName)$
}
$elseif(typecode.contentTypeCode.primitive)$
if (memcmp(&topic_a->$name$$p$, &topic_b->$name$$p$, sizeof(topic_a->$name$$p$)) != 0) return 0;
$elseif(typecode.contentTypeCode.isType_d)$
for(int $loopvar$ = 0; $loopvar$ < topic_a->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic_a->$name$$p$.size(); ++$loopvar$)
{
$array_member_comparision(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name, p=p, loopvar=loopvar), originName=name, loopvar=ctx.nextLoopVarName)$
}
$else$
for(int $loopvar$ = 0; $loopvar$ < topic_a->$name$$p$.size(); ++$loopvar$)
for(uint32_t $loopvar$ = 0; $loopvar$ < topic_a->$name$$p$.size(); ++$loopvar$)
{
$array_member_comparision(ctx=ctx, typecode=typecode.contentTypeCode, name=indexName(name=name, p=p, loopvar=loopvar), originName=name, loopvar=ctx.nextLoopVarName)$
}
Expand Down