Many minor code improvements.

Signed-off-by: Cervenka Dusan <cervenka@acrios.com>

Author: Hadatko

erpc_c/infra/erpc_client_server_common.hpp

@@ -32,7 +32,7 @@
 namespace erpc {
 
 /*!
- * @brief Common class inheritand by client and server class.
+ * @brief Common class inherited by client and server class.
  *
  * @ingroup infra_utility
  */

erpcgen/src/AstWalker.hpp

@@ -53,7 +53,7 @@ class AstWalker
      *
      * @param[in] inputFile Parsed file name.
      */
-    AstWalker(const std::string &inputFile)
+    explicit AstWalker(const std::string &inputFile)
     : m_fileName(inputFile)
     {
     }

erpcgen/src/CGenerator.cpp

@@ -1968,7 +1968,7 @@ string CGenerator::getErrorReturnValue(FunctionBase *fn)
     }
 }
 
-string CGenerator::getFunctionServerCall(Function *fn, FunctionType *functionType, std::string prefix)
+string CGenerator::getFunctionServerCall(Function *fn, FunctionType *functionType, const std::string prefix)
 {
     string proto = "";
     if (!fn->getReturnType()->isVoid() && prefix.length() > 0)
@@ -2910,7 +2910,7 @@ string CGenerator::getExtraDirectionPointer(StructMember *structMember)
     return result;
 }
 
-data_map CGenerator::firstAllocOnReturnWhenIsNeed(string name, DataType *dataType)
+data_map CGenerator::firstAllocOnReturnWhenIsNeed(const string &name, DataType *dataType)
 {
     DataType *trueDataType = dataType->getTrueDataType();
     if ((trueDataType->isArray() || trueDataType->isStruct() || trueDataType->isUnion()) &&
@@ -2923,7 +2923,7 @@ data_map CGenerator::firstAllocOnReturnWhenIsNeed(string name, DataType *dataTyp
     return r;
 }
 
-data_map CGenerator::firstAllocOnServerWhenIsNeed(string name, StructMember *structMember)
+data_map CGenerator::firstAllocOnServerWhenIsNeed(const string &name, StructMember *structMember)
 {
     DataType *dataType = structMember->getDataType();
     DataType *trueDataType = dataType->getTrueDataType();
@@ -3242,10 +3242,10 @@ bool CGenerator::containsByrefParamToFree(DataType *dataType, set<DataType *> &d
     return false;
 }
 
-bool CGenerator::isListStruct(StructType *structType)
+bool CGenerator::isListStruct(const StructType *structType)
 {
     // if structure is transformed list<> to struct{list<>}
-    for (StructType *structList : m_structListTypes)
+    for (const StructType *structList : m_structListTypes)
     {
         if (structType == structList)
         {
@@ -3272,11 +3272,11 @@ bool CGenerator::isBinaryStruct(StructType *structType)
     return false;
 }
 
-bool CGenerator::isBinaryList(ListType *listType)
+bool CGenerator::isBinaryList(const ListType *listType)
 {
 
     // If list is same as in s_listBinaryTypes.
-    for (ListType *list : m_listBinaryTypes)
+    for (const ListType *list : m_listBinaryTypes)
     {
         if (listType == list)
         {

erpcgen/src/CGenerator.hpp

@@ -477,7 +477,7 @@ class CGenerator : public Generator
      *
      * @return String representation for given function.
      */
-    std::string getFunctionServerCall(Function *fn, FunctionType *functionType = nullptr, std::string="");
+    std::string getFunctionServerCall(Function *fn, FunctionType *functionType = nullptr, const std::string="");
 
     /*!
      * @brief This function return name with guard.
@@ -585,7 +585,7 @@ class CGenerator : public Generator
      *
      * @return Erpc_alloc function or empty.
      */
-    cpptempl::data_map firstAllocOnServerWhenIsNeed(std::string name, StructMember *structMember);
+    cpptempl::data_map firstAllocOnServerWhenIsNeed(const std::string &name, StructMember *structMember);
 
     /*!
      * @brief This function call first erpc_alloc on client side return statement if it is need.
@@ -597,7 +597,7 @@ class CGenerator : public Generator
      *
      * @return Erpc_alloc function or empty.
      */
-    cpptempl::data_map firstAllocOnReturnWhenIsNeed(std::string name, DataType *dataType);
+    cpptempl::data_map firstAllocOnReturnWhenIsNeed(const std::string &name, DataType *dataType);
 
     /*!
      * @brief This function return call for alloc space based on given data type.
@@ -713,7 +713,7 @@ class CGenerator : public Generator
      * @retval true When structure is used as a wrapper for binary type.
      * @retval false When structure is not used as a wrapper for binary type.
      */
-    bool isBinaryList(ListType *listType);
+    bool isBinaryList(const ListType *listType);
 
     /*!
      * @brief This function returns true when structure is used as a wrapper for list type.
@@ -723,7 +723,7 @@ class CGenerator : public Generator
      * @retval true When structure is used as a wrapper for list type.
      * @retval false When structure is not used as a wrapper for list type.
      */
-    bool isListStruct(StructType *structType);
+    bool isListStruct(const StructType *structType);
 
     /*!
      * @brief This function returns true when "retain" annotation wasn't set.

erpcgen/src/Generator.cpp

@@ -144,7 +144,7 @@ Generator::Generator(InterfaceDefinition *def, generator_type_t generatorType)
     }
 }
 
-Group *Generator::getGroupByName(string name)
+Group *Generator::getGroupByName(const string &name)
 {
     for (Group *group : m_groups)
     {
@@ -592,22 +592,22 @@ Annotation::program_lang_t Generator::getAnnotationLang()
     throw internal_error("Unsupported generator type specified for annotation.");
 }
 
-Annotation *Generator::findAnnotation(Symbol *symbol, string name)
+Annotation *Generator::findAnnotation(Symbol *symbol, const string &name)
 {
     return symbol->findAnnotation(name, getAnnotationLang());
 }
 
-vector<Annotation *> Generator::getAnnotations(Symbol *symbol, string name)
+vector<Annotation *> Generator::getAnnotations(Symbol *symbol, const string &name)
 {
     return symbol->getAnnotations(name, getAnnotationLang());
 }
 
-Value *Generator::getAnnValue(Symbol *symbol, string name)
+Value *Generator::getAnnValue(Symbol *symbol, const string &name)
 {
     return symbol->getAnnValue(name, getAnnotationLang());
 }
 
-string Generator::getAnnStringValue(Symbol *symbol, string name)
+string Generator::getAnnStringValue(Symbol *symbol, const string &name)
 {
     return symbol->getAnnStringValue(name, getAnnotationLang());
 }

erpcgen/src/Generator.hpp

@@ -274,7 +274,7 @@ class Generator
      *
      * @return Pointer to a group with specified name.
      */
-    Group *getGroupByName(std::string name);
+    Group *getGroupByName(const std::string &name);
 
     /*!
      * @brief This function returns information if member data type symbol is using forward declared type.
@@ -313,7 +313,7 @@ class Generator
      *
      * @return An index into the annotation list
      */
-    Annotation *findAnnotation(Symbol *symbol, std::string name);
+    Annotation *findAnnotation(Symbol *symbol, const std::string &name);
 
     /*!
      * @brief Find annotations matching name in the annotation list
@@ -323,7 +323,7 @@ class Generator
      *
      * @return A vector of matching annotations
      */
-    std::vector<Annotation *> getAnnotations(Symbol *symbol, std::string name);
+    std::vector<Annotation *> getAnnotations(Symbol *symbol, const std::string &name);
 
     /*!
      * @brief This function search and returns Value object for given annotation name.
@@ -333,7 +333,7 @@ class Generator
      *
      * @return NULL if annotation is not found else value object.
      */
-    Value *getAnnValue(Symbol *symbol, std::string name);
+    Value *getAnnValue(Symbol *symbol, const std::string &name);
 
     /*!
      * @brief This function search and returns string for given annotation name.
@@ -343,7 +343,7 @@ class Generator
      *
      * @return empty string if annotation is not found else string value.
      */
-    std::string getAnnStringValue(Symbol *symbol, std::string name);
+    std::string getAnnStringValue(Symbol *symbol, const std::string &name);
 
     /*!
      * @brief This function returns vector of data types from scope.

erpcgen/src/SymbolScanner.cpp

@@ -1535,7 +1535,7 @@ void SymbolScanner::addAnnotations(AstNode *childNode, Symbol *symbol)
             const Token &nameTok = annotation_name->getToken();
             Value *annValue = getAnnotationValue(annotation);
 
-            Annotation ann = Annotation(nameTok, annValue, annLang);
+            Annotation ann(nameTok, annValue, annLang);
 
             symbol->addAnnotation(ann);
 

erpcgen/src/smart_ptr.hpp

@@ -74,6 +74,13 @@ class smart_ptr
         return *this;
     }
 
+    //! To allow setting the pointer directly. Equivalent to a call to set().
+    smart_ptr<T> &operator=(ptr_type p)
+    {
+        set(p);
+        return *this;
+    }
+
     //! Destructor. If an object (pointer) has been set, it will be deleted.
     //! Deletes the object using safe_delete().
     virtual ~smart_ptr() { safe_delete(); }
@@ -133,13 +140,6 @@ class smart_ptr
     //! Returns a boolean indicating whether the object has a pointer set or not.
     operator bool() const { return _p != nullptr; }
 
-    //! To allow setting the pointer directly. Equivalent to a call to set().
-    smart_ptr<T> &operator=(ptr_type p)
-    {
-        set(p);
-        return *this;
-    }
-
     //! Another operator to allow you to treat the object just like a pointer.
     ptr_type operator->() { return _p; }
 

erpcgen/src/types/AliasType.hpp

@@ -34,7 +34,7 @@ class AliasType : public DataType
      * @param[in] name Name.
      * @param[in] elementType Given data type.
      */
-    AliasType(std::string name, DataType *elementType)
+    AliasType(const std::string &name, DataType *elementType)
     : DataType(name, kAliasType)
     , m_elementType(elementType)
     {
@@ -84,7 +84,7 @@ class AliasType : public DataType
      * @see std::string ListType::getDescription() const
      * @see std::string UnionType::getDescription() const
      */
-    virtual std::string getDescription() const;
+    virtual std::string getDescription() const override;
 
 protected:
     DataType *m_elementType; /*!< Alias element data type. */

erpcgen/src/types/Annotation.hpp

@@ -59,7 +59,7 @@ class Annotation
      *
      * @param[in] token  Token contains annotation name and location in parsed file.
      */
-    Annotation(const Token &token)
+    explicit Annotation(const Token &token)
     : m_name(token.getStringValue())
     , m_value(nullptr)
     , m_location(token.getLocation())
@@ -74,7 +74,7 @@ class Annotation
      *
      * @param[in] a Source annotation.
      */
-    Annotation(const Annotation &a)
+    explicit Annotation(const Annotation &a)
     : m_name(a.m_name)
     , m_value(a.m_value)
     , m_location(a.m_location)