Skip to content

Commit 6d011e9

Browse files
HadatkoHadatko
authored
Rename temp variable to more generic one. (#321)
Signed-off-by: Cervenka Dusan <cervenka@acrios.com> Signed-off-by: Cervenka Dusan <cervenka@acrios.com>
1 parent c4dadea commit 6d011e9

File tree

6 files changed

+56
-55
lines changed

6 files changed

+56
-55
lines changed

‎erpcgen/src/CGenerator.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ data_map CGenerator::getStructDefinitionTemplateData(Group *group, StructType *s
11141114
listCounter = 0;
11151115

11161116
structInfo["hasNullableMember"] = false;
1117-
structInfo["needTempVariable"] = false;
1117+
structInfo["needTempVariableI32"] = false;
11181118
structInfo["genStructWrapperF"] = !isBinaryStruct(structType);
11191119
structInfo["noSharedMem"] = (findAnnotation(structType, NO_SHARED_ANNOTATION) != nullptr);
11201120

@@ -1210,13 +1210,13 @@ data_map CGenerator::getStructDefinitionTemplateData(Group *group, StructType *s
12101210
dataType->getName().c_str());
12111211

12121212
// Subtemplate setup for read/write struct calls
1213-
bool needTempVariable = false;
1213+
bool needTempVariableI32 = false;
12141214
member_info["coderCall"] = getEncodeDecodeCall("data->" + memberName, group, dataType, structType, true,
1215-
member, needTempVariable, false);
1215+
member, needTempVariableI32, false);
12161216

1217-
if (needTempVariable)
1217+
if (needTempVariableI32)
12181218
{
1219-
structInfo["needTempVariable"] = true;
1219+
structInfo["needTempVariableI32"] = true;
12201220
}
12211221

12221222
member_info["serializedViaMember"] = "";
@@ -1262,10 +1262,10 @@ data_map CGenerator::getUnionDefinitionTemplateData(Group *group, UnionType *uni
12621262
bool &needUnionsServerFree)
12631263
{
12641264
(void)group;
1265-
bool needTempVariable = false;
1265+
bool needTempVariableI32 = false;
12661266
unionInfo["coderCall"] =
1267-
getEncodeDecodeCall("data->", nullptr, unionType, nullptr, true, nullptr, needTempVariable, false);
1268-
unionInfo["needTempVariable"] = needTempVariable;
1267+
getEncodeDecodeCall("data->", nullptr, unionType, nullptr, true, nullptr, needTempVariableI32, false);
1268+
unionInfo["needTempVariableI32"] = needTempVariableI32;
12691269

12701270
unionInfo["noSharedMem"] = (findAnnotation(unionType, NO_SHARED_ANNOTATION) != nullptr);
12711271

@@ -1391,8 +1391,8 @@ data_map CGenerator::getFunctionBaseTemplateData(Group *group, FunctionBase *fn)
13911391
info["isReturnValue"] = !fn->isOneway();
13921392
info["isSendValue"] = false;
13931393
setTemplateComments(fnSymbol, info);
1394-
info["needTempVariableServer"] = false;
1395-
info["needTempVariableClient"] = false;
1394+
info["needTempVariableServerI32"] = false;
1395+
info["needTempVariableClientI32"] = false;
13961396
info["needNullVariableOnServer"] = false;
13971397

13981398
/* Is function declared as external? */
@@ -1407,7 +1407,7 @@ data_map CGenerator::getFunctionBaseTemplateData(Group *group, FunctionBase *fn)
14071407
if (!trueDataType->isVoid())
14081408
{
14091409
string result = "result";
1410-
bool needTempVariable = false;
1410+
bool needTempVariableI32 = false;
14111411
setCallingFreeFunctions(structMember, returnInfo, true);
14121412
string extraPointer = getExtraPointerInReturn(dataType);
14131413
string resultVariable = extraPointer + returnSpaceWhenNotEmpty(extraPointer) + result;
@@ -1438,10 +1438,10 @@ data_map CGenerator::getFunctionBaseTemplateData(Group *group, FunctionBase *fn)
14381438

14391439
returnInfo["direction"] = getDirection(kReturn);
14401440
returnInfo["coderCall"] =
1441-
getEncodeDecodeCall(result, group, dataType, nullptr, false, structMember, needTempVariable, true);
1441+
getEncodeDecodeCall(result, group, dataType, nullptr, false, structMember, needTempVariableI32, true);
14421442
returnInfo["shared"] = isShared;
14431443
resultVariable = getTypenameName(dataType, resultVariable);
1444-
info["needTempVariableClient"] = needTempVariable;
1444+
info["needTempVariableClientI32"] = needTempVariableI32;
14451445
returnInfo["resultVariable"] = resultVariable;
14461446
returnInfo["errorReturnValue"] = getErrorReturnValue(fn);
14471447
returnInfo["isNullReturnType"] = (!trueDataType->isScalar() && !trueDataType->isEnum());
@@ -1457,7 +1457,7 @@ data_map CGenerator::getFunctionBaseTemplateData(Group *group, FunctionBase *fn)
14571457
for (StructMember *param : fnParams)
14581458
{
14591459
data_map paramInfo;
1460-
bool needTempVariable = false;
1460+
bool needTempVariableI32 = false;
14611461
DataType *paramType = param->getDataType();
14621462
DataType *paramTrueType = paramType->getTrueDataType();
14631463
string name = getOutputName(param);
@@ -1607,20 +1607,20 @@ data_map CGenerator::getFunctionBaseTemplateData(Group *group, FunctionBase *fn)
16071607
Log::debug("Calling EncodeDecode param %s with paramType %s.\n", param->getName().c_str(),
16081608
paramType->getName().c_str());
16091609
paramInfo["coderCall"] = getEncodeDecodeCall(encodeDecodeName, group, paramType, &fn->getParameters(), false,
1610-
param, needTempVariable, true);
1610+
param, needTempVariableI32, true);
16111611

16121612
// set parameter direction
16131613
paramInfo["direction"] = getDirection(param->getDirection());
16141614

16151615
setSymbolDataToSide(param, group->getSymbolDirections(param), paramsToClient, paramsToServer, paramInfo);
16161616

1617-
if (needTempVariable && param->getDirection() != kInDirection)
1617+
if (needTempVariableI32 && param->getDirection() != kInDirection)
16181618
{
1619-
info["needTempVariableClient"] = true;
1619+
info["needTempVariableClientI32"] = true;
16201620
}
1621-
if (needTempVariable && (param->getDirection() == kInDirection || param->getDirection() == kInoutDirection))
1621+
if (needTempVariableI32 && (param->getDirection() == kInDirection || param->getDirection() == kInoutDirection))
16221622
{
1623-
info["needTempVariableServer"] = true;
1623+
info["needTempVariableServerI32"] = true;
16241624
}
16251625
params.push_back(paramInfo);
16261626

‎erpcgen/src/templates/c_client_source.template‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ extern ClientManager *g_client;
4646
erpc_status_t err = kErpcStatus_Success;
4747

4848
{% endif -- generateErrorChecks %}
49+
{% if fn.isReturnValue %}
50+
{% if fn.needTempVariableClientI32 %}
51+
int32_t _tmp_local_i32;
52+
{% endif %}
53+
{% endif %}
4954
{% if fn.returnValue.type.isNotVoid %}
5055
{$fn.returnValue.resultVariable}{% if fn.returnValue.isNullReturnType %} = NULL{% endif %};
5156
{% endif -- isNotVoid %}
@@ -100,18 +105,14 @@ extern ClientManager *g_client;
100105
{$clientIndent} // Codec status is checked inside this function.
101106
{$clientIndent} g_client->performRequest(request);
102107
{% if fn.isReturnValue %}
103-
{% if fn.needTempVariableClient %}
104-
105-
{$clientIndent} int32_t _tmp_local;
106-
{% endif %}
107108
{% for param in fn.parametersToClient if (param.serializedDirection == "" || param.serializedDirection == InDirection || param.referencedName != "") %}
108109

109110
{% if param.isNullable %}
110-
{% if ((source == "client") && (param.direction != ReturnDirection) && (empty(param.lengthName) == false)) %}
111-
{% set lengthNameCon = ") && (" & param.lengthName & " != NULL)" >%}
112-
{% else %}
113-
{% set lengthNameCon = "" >%}
114-
{% endif %}
111+
{% if ((source == "client") && (param.direction != ReturnDirection) && (empty(param.lengthName) == false)) %}
112+
{% set lengthNameCon = ") && (" & param.lengthName & " != NULL)" >%}
113+
{% else %}
114+
{% set lengthNameCon = "" >%}
115+
{% endif %}
115116
{$clientIndent} if ({% if lengthNameCon != "" %}({% endif %}{$param.nullableName} != NULL{$lengthNameCon})
116117
{$clientIndent} {
117118
{$addIndent(clientIndent & " ", param.coderCall.decode(param.coderCall))}

‎erpcgen/src/templates/c_coders.template‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ else
7171
{% enddef ------------------------------- BinaryType %}
7272

7373
{% def decodeEnumType(info) ---------------- EnumType %}
74-
codec->read(&_tmp_local);
74+
codec->read(&_tmp_local_i32);
7575
{% if source == "client" && info.pointerScalarTypes %}
76-
*{$info.name} = static_cast<{$info.enumName}>(_tmp_local);
76+
*{$info.name} = static_cast<{$info.enumName}>(_tmp_local_i32);
7777
{% else %}
78-
{$info.name} = static_cast<{$info.enumName}>(_tmp_local);
78+
{$info.name} = static_cast<{$info.enumName}>(_tmp_local_i32);
7979
{% endif -- pointerScalarTypes %}
8080
{% enddef ---------------------------------- EnumType %}
8181

@@ -141,18 +141,18 @@ read_{$info.typeName}_struct(codec, {$info.name});
141141
{% def decodeUnionParamType(info) --------------- UnionParamType %}
142142
{% if info.inDataContainer %}
143143
{% if info.castDiscriminator %}
144-
read_{$info.typeName}_union(codec, &_tmp_local, &{$info.name});
144+
read_{$info.typeName}_union(codec, &_tmp_local_i32, &{$info.name});
145145
{% if !info.isConstant %}
146-
{$info.dataLiteral}{$info.discriminatorName} = static_cast<{$info.discriminatorType}>(_tmp_local);
146+
{$info.dataLiteral}{$info.discriminatorName} = static_cast<{$info.discriminatorType}>(_tmp_local_i32);
147147
{% endif %}
148148
{% else %}
149149
read_{$info.typeName}_union(codec, &{$info.dataLiteral}{$info.discriminatorName}, &{$info.name});
150150
{% endif -- castDiscriminator %}
151151
{% else -- not inDataContainer %}
152152
{% if info.castDiscriminator %}
153-
read_{$info.typeName}_union(codec, &_tmp_local, {$info.name});
153+
read_{$info.typeName}_union(codec, &_tmp_local_i32, {$info.name});
154154
{% if !info.isConstant %}
155-
{% if info.discrimPtr == true && source == "client" %}*{% endif %}{$info.discriminatorName} = static_cast<{$info.discriminatorType}>(_tmp_local);
155+
{% if info.discrimPtr == true && source == "client" %}*{% endif %}{$info.discriminatorName} = static_cast<{$info.discriminatorType}>(_tmp_local_i32);
156156
{% endif %}
157157
{% else %}
158158
read_{$info.typeName}_union(codec, {% if info.discrimPtr == false || source != "client" %}&{% endif %}{$info.discriminatorName}, {$info.name});
@@ -161,9 +161,9 @@ read_{$info.typeName}_union(codec, {% if info.discrimPtr == false || source != "
161161
{% enddef -------------------------- UnionParamType %}
162162

163163
{% def decodeUnionType(info) ---------------- %}
164-
codec->startReadUnion({% if info.castDiscriminator %}{% if info.dataLiteral != "" %}&{% endif %}_tmp_local{% else %}{% if info.dataLiteral != "" %}&{$info.dataLiteral}{% endif %}{$info.discriminatorName}{% endif %});
164+
codec->startReadUnion({% if info.castDiscriminator %}{% if info.dataLiteral != "" %}&{% endif %}_tmp_local_i32{% else %}{% if info.dataLiteral != "" %}&{$info.dataLiteral}{% endif %}{$info.discriminatorName}{% endif %});
165165
{% if info.castDiscriminator %}
166-
{$info.dataLiteral}{$info.discriminatorName} = static_cast<{$info.discriminatorType}>(_tmp_local);
166+
{$info.dataLiteral}{$info.discriminatorName} = static_cast<{$info.discriminatorType}>(_tmp_local_i32);
167167
{% endif -- info.castDiscriminator %}
168168
switch ({% if info.dataLiteral != "" %}{$info.dataLiteral}{% else %}*{% endif %}{$info.discriminatorName})
169169
{
@@ -202,15 +202,15 @@ read_{$info.sharedType}_struct_shared(codec, {$info.name});
202202
{% else %}
203203
{% if info.inDataContainer %}
204204
{% if info.castDiscriminator %}
205-
read_{$info.sharedType}_union_shared(codec, &_tmp_local, &{$info.name});
206-
{$info.dataLiteral}{$info.discriminatorName} = static_cast<{$info.discriminatorType}>(_tmp_local);
205+
read_{$info.sharedType}_union_shared(codec, &_tmp_local_i32, &{$info.name});
206+
{$info.dataLiteral}{$info.discriminatorName} = static_cast<{$info.discriminatorType}>(_tmp_local_i32);
207207
{% else %}
208208
read_{$info.sharedType}_union_shared(codec, &{$info.dataLiteral}{$info.discriminatorName}, &{$info.name});
209209
{% endif -- castDiscriminator %}
210210
{% else -- not inDataContainer %}
211211
{% if info.castDiscriminator %}
212-
read_{$info.sharedType}_union_shared(codec, &_tmp_local, {$info.name});
213-
{% if info.discrimPtr == true && source == "client" %}*{% endif %}{$info.discriminatorName} = static_cast<{$info.discriminatorType}>(_tmp_local);
212+
read_{$info.sharedType}_union_shared(codec, &_tmp_local_i32, {$info.name});
213+
{% if info.discrimPtr == true && source == "client" %}*{% endif %}{$info.discriminatorName} = static_cast<{$info.discriminatorType}>(_tmp_local_i32);
214214
{% else %}
215215
read_{$info.sharedType}_union_shared(codec, {% if info.discrimPtr == false || source != "client" %}&{% endif %}{$info.discriminatorName}, {$info.name});
216216
{% endif -- castDiscriminator %}

‎erpcgen/src/templates/c_common_functions.template‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ static void read_{$struct.name}_struct(erpc::{$codecClass} * codec, {$struct.nam
147147
{% if struct.hasNullableMember %}
148148
bool isNull;
149149
{% endif -- hasNullableMember %}
150-
{% if struct.needTempVariable %}
151-
int32_t _tmp_local;
150+
{% if struct.needTempVariableI32 %}
151+
int32_t _tmp_local_i32;
152152
{% endif %}
153-
{% if struct.needTempVariable || struct.hasNullableMember %}
153+
{% if struct.needTempVariableI32 || struct.hasNullableMember %}
154154

155155
{% endif %}
156156
if(NULL == data)
@@ -284,8 +284,8 @@ static void read_{$union.name}_union_shared(erpc::{$codecClass} * codec, int32_t
284284
static void read_{$union.name}_union(erpc::{$codecClass} * codec, int32_t * discriminator, {$union.name} * data)
285285
{% endif %}
286286
{
287-
{% if union.needTempVariable %}
288-
int32_t _tmp_local;
287+
{% if union.needTempVariableI32 %}
288+
int32_t _tmp_local_i32;
289289

290290
{% endif %}
291291
if(NULL == data)

‎erpcgen/src/templates/c_server_source.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ ERPC_MANUALLY_CONSTRUCTED_STATIC({$iface.serviceClassName}, s_{$iface.serviceCla
7070
{% if fn.needNullVariableOnServer %}
7171
bool isNull;
7272
{% endif -- needNullVariableOnServer %}
73-
{% if fn.needTempVariableServer %}
74-
int32_t _tmp_local;
73+
{% if fn.needTempVariableServerI32 %}
74+
int32_t _tmp_local_i32;
7575
{% endif %}
7676
{% if fn.returnValue.type.isNotVoid %}
7777
{$fn.returnValue.resultVariable}{% if fn.returnValue.isNullReturnType %} = NULL{% endif %};

‎erpcgen/test/test_union_c.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ test_server.cpp:
236236
- "{"
237237
- codec->updateStatus(kErpcStatus_MemoryError);
238238
- "}"
239-
- int32_t _tmp_local;
240-
- not: codec->read(&_tmp_local);
241-
- not: discriminator = static_cast<fruitType>(_tmp_local);
242-
- read_unionType_union(codec, &_tmp_local, unionVariable);
243-
- discriminator = static_cast<fruitType>(_tmp_local);
239+
- int32_t _tmp_local_i32;
240+
- not: codec->read(&_tmp_local_i32);
241+
- not: discriminator = static_cast<fruitType>(_tmp_local_i32);
242+
- read_unionType_union(codec, &_tmp_local_i32, unionVariable);
243+
- discriminator = static_cast<fruitType>(_tmp_local_i32);
244244
- myUnion(discriminator, unionVariable);
245245

246246
---
@@ -278,8 +278,8 @@ test_client.cpp:
278278
- write_unionType_union(codec, static_cast<int32_t>(data->discriminator), &data->unionVariable);
279279

280280
test_server.cpp:
281-
- int32_t _tmp_local;
282-
- read_unionType_union(codec, &_tmp_local, &data->unionVariable);
281+
- int32_t _tmp_local_i32;
282+
- read_unionType_union(codec, &_tmp_local_i32, &data->unionVariable);
283283

284284
#test_client.cpp:
285285
# - static int32_t write_unionType_union(erpc::Codec * codec, int32_t discriminator, const unionType * data);

0 commit comments

Comments
 (0)