Skip to content

Commit acd195d

Browse files
MichalPrincNXPMichalPrincNXP
committed
Format files that are causing clang format check issues
1 parent fa8cfdf commit acd195d

File tree

4 files changed

+86
-61
lines changed

4 files changed

+86
-61
lines changed

‎.github/workflows/clang-format.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ jobs:
1111
- uses: DoozyX/clang-format-lint-action@v0.16.2
1212
with:
1313
source: '.'
14+
exclude: 'examples/zephyr/matrix_multiply_rpmsglite/src/service examples/zephyr/matrix_multiply_uart/src/service'
1415
clangFormatVersion: 16

‎erpc_c/port/erpc_threading.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ class Thread
128128
* @param[in] stackSize Stack size.
129129
* @param[in] stackPtr Mandatory task stack pointer for static api usage.
130130
*/
131-
void init(thread_entry_t entry, uint32_t priority = 0, uint32_t stackSize = 0, thread_stack_pointer stackPtr = NULL);
131+
void init(thread_entry_t entry, uint32_t priority = 0, uint32_t stackSize = 0,
132+
thread_stack_pointer stackPtr = NULL);
132133

133134
/*!
134135
* @brief This function starts thread execution.
@@ -231,9 +232,9 @@ class Thread
231232
static pthread_key_t s_threadObjectKey; /*!< Thread key. */
232233
pthread_t m_thread; /*!< Current thread. */
233234
#elif ERPC_THREADS_IS(FREERTOS)
234-
TaskHandle_t m_task; /*!< Current task. */
235-
Thread *m_next; /*!< Pointer to next Thread. */
236-
static Thread *s_first; /*!< Pointer to first Thread. */
235+
TaskHandle_t m_task; /*!< Current task. */
236+
Thread *m_next; /*!< Pointer to next Thread. */
237+
static Thread *s_first; /*!< Pointer to first Thread. */
237238
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
238239
StaticTask_t m_staticTask; /*!< Hold static task data. */
239240
#endif
@@ -412,7 +413,7 @@ class Mutex
412413
#elif ERPC_THREADS_IS(ZEPHYR)
413414
struct k_mutex m_mutex; /*!< Mutex.*/
414415
#elif ERPC_THREADS_IS(MBED)
415-
rtos::Mutex *m_mutex; /*!< Mutex. */
416+
rtos::Mutex *m_mutex; /*!< Mutex. */
416417
#elif ERPC_THREADS_IS(WIN32)
417418
HANDLE m_mutex;
418419
#elif ERPC_THREADS_IS(THREADX)
@@ -498,7 +499,7 @@ class Semaphore
498499
SemaphoreHandle_t m_sem; /*!< Semaphore. */
499500
StaticSemaphore_t m_staticQueue; /*!< Static queue. */
500501
#elif ERPC_THREADS_IS(ZEPHYR)
501-
struct k_sem m_sem; /*!< Semaphore. */
502+
struct k_sem m_sem; /*!< Semaphore. */
502503
#elif ERPC_THREADS_IS(MBED)
503504
rtos::Semaphore *m_sem; /*!< Semaphore. */
504505
int m_count; /*!< Semaphore count number. */

‎erpcgen/src/JavaGenerator.cpp‎

Lines changed: 63 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@ extern const char *const kJavaInterface;
3434
// Code
3535
////////////////////////////////////////////////////////////////////////////////
3636

37-
JavaGenerator::JavaGenerator(InterfaceDefinition *def, const std::string javaPackageName)
38-
: Generator(def, generator_type_t::kJava)
39-
, m_javaPackageName(javaPackageName)
40-
, m_suffixStrip("")
41-
, m_suffixStripSize(0)
37+
JavaGenerator::JavaGenerator(InterfaceDefinition *def, const std::string javaPackageName) :
38+
Generator(def, generator_type_t::kJava), m_javaPackageName(javaPackageName), m_suffixStrip(""), m_suffixStripSize(0)
4239
{
4340
/* Set copyright rules. */
4441
if (m_def->hasProgramSymbol())
@@ -354,7 +351,7 @@ data_map JavaGenerator::getFunctionTemplateData(Group *group, Function *fn)
354351
}
355352

356353
string JavaGenerator::getFunctionPrototype(Group *group, FunctionBase *fn, const string &interfaceName,
357-
const string &name, bool insideInterfaceCall)
354+
const string &name, bool insideInterfaceCall)
358355
{
359356
FunctionType *functionType = dynamic_cast<FunctionType *>(fn);
360357
if (functionType)
@@ -385,20 +382,20 @@ string JavaGenerator::getFunctionPrototype(Group *group, FunctionBase *fn, const
385382
// Skip data serialization for variables placed as @length value for lists.
386383
if (findParamReferencedFromAnn(params, getOutputName(it), LENGTH_ANNOTATION))
387384
{
388-
continue;
385+
continue;
389386
}
390387

391388
if (!isFirst)
392389
{
393-
proto += ", ";
394-
390+
proto += ", ";
395391
}
396392
else
397393
{
398-
isFirst = false;
394+
isFirst = false;
399395
}
400396

401-
if (it->getDirection() == param_direction_t::kOutDirection || it->getDirection() == param_direction_t::kInoutDirection)
397+
if (it->getDirection() == param_direction_t::kOutDirection ||
398+
it->getDirection() == param_direction_t::kInoutDirection)
402399
{
403400
proto += getTypenameName(it->getDataType(), true, true);
404401
}
@@ -419,17 +416,17 @@ string JavaGenerator::getTypenameName(DataType *t, bool isReference, bool object
419416
{
420417
string returnName;
421418

422-
423-
424419
switch (t->getDataType())
425420
{
426-
case DataType::data_type_t::kArrayType: {
421+
case DataType::data_type_t::kArrayType:
422+
{
427423
ArrayType *a = dynamic_cast<ArrayType *>(t);
428424
assert(a);
429425
returnName = getTypenameName(a->getElementType(), false, false) + "[]";
430426
break;
431427
}
432-
case DataType::data_type_t::kBuiltinType: {
428+
case DataType::data_type_t::kBuiltinType:
429+
{
433430
assert(nullptr != dynamic_cast<const BuiltinType *>(t));
434431
if (objectType)
435432
{
@@ -442,23 +439,27 @@ string JavaGenerator::getTypenameName(DataType *t, bool isReference, bool object
442439

443440
break;
444441
}
445-
case DataType::data_type_t::kListType: {
442+
case DataType::data_type_t::kListType:
443+
{
446444
const ListType *a = dynamic_cast<const ListType *>(t);
447445
assert(a);
448446
returnName = "List<" + getTypenameName(a->getElementType(), false, true) + ">";
449447
break;
450448
}
451-
case DataType::data_type_t::kAliasType: {
449+
case DataType::data_type_t::kAliasType:
450+
{
452451
AliasType *aliasType = dynamic_cast<AliasType *>(t);
453452
return getTypenameName(aliasType->getTrueDataType(), isReference, objectType);
454453
}
455-
case DataType::data_type_t::kVoidType: {
454+
case DataType::data_type_t::kVoidType:
455+
{
456456
returnName = "void";
457457
break;
458458
}
459459
case DataType::data_type_t::kUnionType:
460460
case DataType::data_type_t::kEnumType:
461-
case DataType::data_type_t::kStructType: {
461+
case DataType::data_type_t::kStructType:
462+
{
462463
returnName = getOutputName(t);
463464
break;
464465
}
@@ -638,7 +639,8 @@ data_map JavaGenerator::makeGroupSymbolsTemplateData(Group *group)
638639

639640
switch (dataType->getDataType())
640641
{
641-
case DataType::data_type_t::kStructType: {
642+
case DataType::data_type_t::kStructType:
643+
{
642644
StructType *structType = dynamic_cast<StructType *>(symbol);
643645
if (structType == nullptr)
644646
{
@@ -662,7 +664,8 @@ data_map JavaGenerator::makeGroupSymbolsTemplateData(Group *group)
662664
}
663665
break;
664666
}
665-
case DataType::data_type_t::kUnionType: {
667+
case DataType::data_type_t::kUnionType:
668+
{
666669
UnionType *unionType = dynamic_cast<UnionType *>(symbol);
667670
if (unionType == nullptr)
668671
{
@@ -692,7 +695,8 @@ data_map JavaGenerator::makeGroupSymbolsTemplateData(Group *group)
692695
}
693696
break;
694697
}
695-
case DataType::data_type_t::kAliasType: {
698+
case DataType::data_type_t::kAliasType:
699+
{
696700
AliasType *aliasType = dynamic_cast<AliasType *>(symbol);
697701
if (aliasType == nullptr)
698702
break;
@@ -791,7 +795,7 @@ data_map JavaGenerator::getEncodeDecodeCall(const string &name, DataType *t, Str
791795
{
792796
static uint8_t listArrayCounter; // Used for creating nested loops variable names
793797
data_map templateData;
794-
bool isReference = (isStructMember && structMember->isByref()) ||
798+
bool isReference = (isStructMember && structMember->isByref()) ||
795799
(isFunctionParam && (structMember->getDirection() == param_direction_t::kOutDirection ||
796800
structMember->getDirection() == param_direction_t::kInoutDirection));
797801
templateData["type"] = getTypeInfo(t, isReference); // Type info about variable
@@ -804,14 +808,16 @@ data_map JavaGenerator::getEncodeDecodeCall(const string &name, DataType *t, Str
804808

805809
switch (t->getDataType())
806810
{
807-
case DataType::data_type_t::kAliasType: {
811+
case DataType::data_type_t::kAliasType:
812+
{
808813
AliasType *aliasType = dynamic_cast<AliasType *>(t);
809814
assert(aliasType);
810815
templateData = getEncodeDecodeCall(name, aliasType->getElementType(), structType, inDataContainer, false,
811816
structMember, true, false);
812817
break;
813818
}
814-
case DataType::data_type_t::kArrayType: {
819+
case DataType::data_type_t::kArrayType:
820+
{
815821
ArrayType *arrayType = dynamic_cast<ArrayType *>(t);
816822
assert(arrayType);
817823
DataType *elementType = arrayType->getElementType()->getTrueDataType();
@@ -833,20 +839,24 @@ data_map JavaGenerator::getEncodeDecodeCall(const string &name, DataType *t, Str
833839
templateData["isElementArrayType"] = elementType->isArray();
834840
break;
835841
}
836-
case DataType::data_type_t::kBuiltinType: {
842+
case DataType::data_type_t::kBuiltinType:
843+
{
837844
templateData["decode"] = m_templateData["decodeBuiltinType"];
838845
templateData["encode"] = m_templateData["encodeBuiltinType"];
839846
break;
840847
}
841-
case DataType::data_type_t::kEnumType: {
848+
case DataType::data_type_t::kEnumType:
849+
{
842850
templateData["decode"] = m_templateData["decodeEnumType"];
843851
templateData["encode"] = m_templateData["encodeEnumType"];
844852
break;
845853
}
846-
case DataType::data_type_t::kFunctionType: {
854+
case DataType::data_type_t::kFunctionType:
855+
{
847856
throw internal_error("Java does not support functions yet.");
848857
}
849-
case DataType::data_type_t::kListType: {
858+
case DataType::data_type_t::kListType:
859+
{
850860
ListType *listType = dynamic_cast<ListType *>(t);
851861
assert(listType);
852862
DataType *elementType = listType->getElementType()->getTrueDataType();
@@ -890,15 +900,18 @@ data_map JavaGenerator::getEncodeDecodeCall(const string &name, DataType *t, Str
890900

891901
break;
892902
}
893-
case DataType::data_type_t::kStructType: {
903+
case DataType::data_type_t::kStructType:
904+
{
894905
templateData["decode"] = m_templateData["decodeStructType"];
895906
templateData["encode"] = m_templateData["encodeStructType"];
896907
break;
897908
}
898-
case DataType::data_type_t::kUnionType: {
909+
case DataType::data_type_t::kUnionType:
910+
{
899911
break;
900912
}
901-
default: {
913+
default:
914+
{
902915
throw internal_error("unknown member type");
903916
}
904917
}
@@ -948,40 +961,48 @@ data_map JavaGenerator::getTypeInfo(DataType *t, int isReference, bool inDataCon
948961
info["isNonEncapsulatedUnion"] = false;
949962
switch (t->getDataType())
950963
{
951-
case DataType::data_type_t::kAliasType: {
964+
case DataType::data_type_t::kAliasType:
965+
{
952966
info = getTypeInfo(t->getTrueDataType(), false);
953967
break;
954968
}
955-
case DataType::data_type_t::kArrayType: {
969+
case DataType::data_type_t::kArrayType:
970+
{
956971
// Array type requires the array element count to come after the variable/member name.
957972
info["type"] = "array";
958973
break;
959974
}
960-
case DataType::data_type_t::kBuiltinType: {
975+
case DataType::data_type_t::kBuiltinType:
976+
{
961977
assert(dynamic_cast<const BuiltinType *>(t));
962978
info["type"] = getBuiltinTypename(dynamic_cast<const BuiltinType *>(t));
963979
info["codecTypeName"] = getBuiltinCodecTypeName(dynamic_cast<const BuiltinType *>(t));
964980
break;
965981
}
966-
case DataType::data_type_t::kEnumType: {
982+
case DataType::data_type_t::kEnumType:
983+
{
967984
info["type"] = "enum";
968985
break;
969986
}
970-
case DataType::data_type_t::kFunctionType: {
987+
case DataType::data_type_t::kFunctionType:
988+
{
971989
info["type"] = "function";
972990
break;
973991
}
974-
case DataType::data_type_t::kListType: {
992+
case DataType::data_type_t::kListType:
993+
{
975994
info["type"] = "list";
976995
break;
977996
}
978-
case DataType::data_type_t::kStructType: {
997+
case DataType::data_type_t::kStructType:
998+
{
979999
info["type"] = "struct";
9801000
info["decode"] = m_templateData["decodeStructType"];
9811001
info["encode"] = m_templateData["encodeStructType"];
9821002
break;
9831003
}
984-
case DataType::data_type_t::kUnionType: {
1004+
case DataType::data_type_t::kUnionType:
1005+
{
9851006
UnionType *unionType = dynamic_cast<UnionType *>(t);
9861007
assert(unionType);
9871008
info["type"] = "union";
@@ -1102,7 +1123,8 @@ data_map JavaGenerator::getTypeInfo(DataType *t, int isReference, bool inDataCon
11021123
info["cases"] = unionCases;
11031124
break;
11041125
}
1105-
case DataType::data_type_t::kVoidType: {
1126+
case DataType::data_type_t::kVoidType:
1127+
{
11061128
info["type"] = "void";
11071129
break;
11081130
}

0 commit comments

Comments
 (0)