Namespace can be defined by user. Default erpcshim

Signed-off-by: Cervenka Dusan <[email protected]>

erpcgen/Makefile

@@ -70,7 +70,8 @@ SOURCES += $(OBJS_ROOT)/erpcgen_parser.tab.cpp \
 # Prevent make from deleting these temp files.
 .SECONDARY: $(OBJS_ROOT)/erpcgen_parser.tab.cpp \
             $(OBJS_ROOT)/erpcgen_lexer.cpp \
-            $(OBJS_ROOT)/erpcgen/src/templates/c_common_header.c \
+            $(OBJS_ROOT)/erpcgen/src/templates/c_common_standard_header.c \
+            $(OBJS_ROOT)/erpcgen/src/templates/c_common_erpc_header.c \
             $(OBJS_ROOT)/erpcgen/src/templates/cpp_interface_header.c \
             $(OBJS_ROOT)/erpcgen/src/templates/cpp_interface_source.c \
             $(OBJS_ROOT)/erpcgen/src/templates/cpp_client_header.c \
@@ -92,7 +93,8 @@ SOURCES += $(OBJS_ROOT)/erpcgen_parser.tab.cpp \
             $(OBJS_ROOT)/erpcgen/src/templates/py_coders.c \
             $(OBJS_ROOT)/erpcgen/src/templates/py_global_init.c
 
-SOURCES +=  $(OBJS_ROOT)/erpcgen/src/templates/c_common_header.c \
+SOURCES +=  $(OBJS_ROOT)/erpcgen/src/templates/c_common_standard_header.c \
+            $(OBJS_ROOT)/erpcgen/src/templates/c_common_erpc_header.c \
             $(OBJS_ROOT)/erpcgen/src/templates/cpp_interface_header.c \
             $(OBJS_ROOT)/erpcgen/src/templates/cpp_interface_source.c \
             $(OBJS_ROOT)/erpcgen/src/templates/cpp_client_header.c \

erpcgen/VisualStudio_v14/.gitignore

@@ -9,7 +9,8 @@ cpp_client_header.cpp
 cpp_server_header.cpp
 cpp_server_source.cpp
 cpp_coders.cpp
-c_common_header.cpp
+c_common_standard_header.cpp
+c_common_erpc_header.cpp
 c_client_source.cpp
 c_client_header.cpp
 c_server_header.cpp

erpcgen/VisualStudio_v14/erpcgen.vcxproj

@@ -98,7 +98,8 @@
     </CustomBuildStep>
     <PreBuildEvent>
       <Command>python.exe ..\bin\txt_to_c.py --output .\cpp_coders.cpp ..\src\templates\cpp_coders.template
-python.exe ..\bin\txt_to_c.py --output .\c_common_header.cpp ..\src\templates\c_common_header.template
+python.exe ..\bin\txt_to_c.py --output .\c_common_standard_header.cpp ..\src\templates\c_common_standard_header.template
+python.exe ..\bin\txt_to_c.py --output .\c_common_erpc_header.cpp ..\src\templates\c_common_erpc_header.template
 python.exe ..\bin\txt_to_c.py --output .\cpp_interface_header.cpp ..\src\templates\cpp_interface_header.template
 python.exe ..\bin\txt_to_c.py --output .\cpp_interface_source.cpp ..\src\templates\cpp_interface_source.template
 python.exe ..\bin\txt_to_c.py --output .\cpp_client_header.cpp ..\src\templates\cpp_client_header.template
@@ -145,7 +146,8 @@ python.exe ..\bin\txt_to_c.py --output .\py_global_init.cpp ..\src\templates\py_
     </Link>
     <PreBuildEvent>
       <Command>python.exe ..\bin\txt_to_c.py --output .\cpp_coders.cpp ..\src\templates\cpp_coders.template
-python.exe ..\bin\txt_to_c.py --output .\c_common_header.cpp ..\src\templates\c_common_header.template
+python.exe ..\bin\txt_to_c.py --output .\c_common_standard_header.cpp ..\src\templates\c_common_standard_header.template
+python.exe ..\bin\txt_to_c.py --output .\c_common_erpc_header.cpp ..\src\templates\c_common_erpc_header.template
 python.exe ..\bin\txt_to_c.py --output .\cpp_interface_header.cpp ..\src\templates\cpp_interface_header.template
 python.exe ..\bin\txt_to_c.py --output .\cpp_interface_source.cpp ..\src\templates\cpp_interface_source.template
 python.exe ..\bin\txt_to_c.py --output .\cpp_client_header.cpp ..\src\templates\cpp_client_header.template
@@ -244,7 +246,8 @@ python.exe ..\bin\txt_to_c.py --output .\py_global_init.cpp ..\src\templates\py_
     <ClCompile Include="..\src\UniqueIdChecker.cpp" />
     <ClCompile Include="..\src\Utils.cpp" />
     <ClCompile Include="cpp_coders.cpp" />
-    <ClCompile Include="c_common_header.cpp" />
+    <ClCompile Include="c_common_standard_header.cpp" />
+    <ClCompile Include="c_common_erpc_header.cpp" />
     <ClCompile Include="c_crc.cpp" />
     <ClCompile Include="cpp_interface_header.cpp" />
     <ClCompile Include="cpp_interface_source.cpp" />

erpcgen/VisualStudio_v14/erpcgen.vcxproj.filters

@@ -167,7 +167,10 @@
     <ClCompile Include="cpp_coders.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="c_common_header.cpp">
+    <ClCompile Include="c_common_standard_header.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="c_common_erpc_header.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="cpp_interface_header.cpp">

erpcgen/src/CGenerator.cpp

@@ -31,7 +31,8 @@ using namespace std;
 static const char *const kIdentifierChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
 
 // Templates strings converted from text files by txt_to_c.py.
-extern const char *const kCCommonHeader;
+extern const char *const kCCommonStandardHeader;
+extern const char *const kCCommonErpcHeader;
 extern const char *const kCppInterfaceHeader;
 extern const char *const kCppInterfaceSource;
 extern const char *const kCppClientHeader;
@@ -78,7 +79,8 @@ CGenerator::CGenerator(InterfaceDefinition *def)
 
 void CGenerator::generateOutputFiles(const string &fileName)
 {
-    generateCommonCHeaderFiles(fileName);
+    generateCommonStandardCHeaderFiles(fileName);
+    generateCommonErpcCHeaderFiles(fileName);
 
     generateInterfaceCppHeaderFile(fileName);
     generateInterfaceCppSourceFile(fileName);
@@ -96,12 +98,20 @@ void CGenerator::generateOutputFiles(const string &fileName)
     generateServerCSourceFile(fileName);
 }
 
-void CGenerator::generateCommonCHeaderFiles(string fileName)
+void CGenerator::generateCommonStandardCHeaderFiles(string fileName)
 {
-    fileName += "_common.h";
-    m_templateData["commonCGuardMacro"] = generateIncludeGuardName(fileName);
-    m_templateData["commonCHeaderName"] = fileName;
-    generateOutputFile(fileName, "c_common_header", m_templateData, kCCommonHeader);
+    fileName += "_common_standard.h";
+    m_templateData["commonStandardCGuardMacro"] = generateIncludeGuardName(fileName);
+    m_templateData["commonStandardCHeaderName"] = fileName;
+    generateOutputFile(fileName, "c_common_standard_header", m_templateData, kCCommonStandardHeader);
+}
+
+void CGenerator::generateCommonErpcCHeaderFiles(string fileName)
+{
+    fileName += "_common_erpc.h";
+    m_templateData["commonErpcCGuardMacro"] = generateIncludeGuardName(fileName);
+    m_templateData["commonErpcCHeaderName"] = fileName;
+    generateOutputFile(fileName, "c_common_erpc_header", m_templateData, kCCommonErpcHeader);
 }
 
 void CGenerator::generateInterfaceCppHeaderFile(string fileName)

erpcgen/src/CGenerator.hpp

@@ -92,11 +92,18 @@ class CGenerator : public Generator
     void generateOutputFiles(const std::string &fileNameExtension) override;
 
     /*!
-     * @brief This function generate output common header file.
+     * @brief This function generate header file output with common standard code.
      *
-     * @param[in] fileName Name for output client source file.
+     * @param[in] fileName Name for common standard header file output.
+     */
+    void generateCommonStandardCHeaderFiles(std::string fileName);
+
+    /*!
+     * @brief This function generate header file output with common eRPC code.
+     *
+     * @param[in] fileName Name for common eRPC header file output.
      */
-    void generateCommonCHeaderFiles(std::string fileName);
+    void generateCommonErpcCHeaderFiles(std::string fileName);
 
     /*!
      * @brief This function generate output interface header file.

erpcgen/src/Generator.cpp

@@ -91,6 +91,15 @@ Generator::Generator(InterfaceDefinition *def, generator_type_t generatorType)
         {
             scopeName = getAnnStringValue(program, SCOPE_NAME_ANNOTATION);
         }
+
+        if (findAnnotation(m_def->getProgramSymbol(), NAMESPACE_ANNOTATION) != nullptr)
+        {
+            m_templateData["namespace"] = getAnnStringValue(m_def->getProgramSymbol(), NAMESPACE_ANNOTATION);
+        }
+        else
+        {
+            m_templateData["namespace"] = "erpcshim";
+        }
     }
 
     m_templateData["scopeName"] = scopeName;

erpcgen/src/annotations.h

@@ -40,6 +40,9 @@
 //! Specify the symbol name.
 #define NAME_ANNOTATION "name"
 
+//! Specify the namespace of program code.
+#define NAMESPACE_ANNOTATION "namespace"
+
 //! Turn off error checking code for allocations in generated output
 #define NO_ALLOC_ERRORS_ANNOTATION "no_alloc_errors"
 

erpcgen/src/templates/c_client_header.template

@@ -7,7 +7,8 @@
 #if !defined({$clientCGuardMacro})
 #define {$clientCGuardMacro}
 
-#include "{$commonCHeaderName}"
+#include "{$commonStandardCHeaderName}"
+#include "{$commonErpcCHeaderName}"
 #include "erpc_client_manager.h"
 {% for iface in group.interfaces %}
 {%  for fn in iface.functions %}

erpcgen/src/templates/c_client_source.template

@@ -16,6 +16,7 @@
 
 using namespace erpc;
 using namespace std;
+{$usingNamespace() >}
 {% for iface in group.interfaces %}
 {%  if count(iface.callbacksAll) > 0 %}
 

erpcgen/src/templates/c_common_header.template → erpcgen/src/templates/c_common_erpc_header.template

@@ -4,32 +4,20 @@
 {% endif %}
 {$commonHeader()}
 
-#if !defined({$commonCGuardMacro})
-#define {$commonCGuardMacro}
+#if !defined({$commonErpcCGuardMacro})
+#define {$commonErpcCGuardMacro}
 {% if usedUnionType %}
 
 #if defined(__CC_ARM) || defined(__ARMCC_VERSION)
 #pragma anon_unions
 #endif
 {% endif -- usedUnionType %}
-#ifdef __cplusplus
-
-{% for inc in includes %}
-#include "{$inc}"
-{% endfor -- includes %}
 
+#ifdef __cplusplus
 extern "C"
 {
 #endif
 
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include "erpc_version.h"
-{% if empty(crc16) == false %}
-#include "{$crcHeaderName}"
-{% endif  -- empty(crc16) == false %}
-
 {$checkVersion()}
 {$>checkCrc()}
 
@@ -107,4 +95,4 @@ extern const {$c.typeAndName};{$c.ilComment}{$loop.addNewLineIfNotLast}
 }
 #endif // __cplusplus
 
-#endif // {$commonCGuardMacro}
+#endif // {$commonErpcCGuardMacro}

erpcgen/src/templates/c_common_standard_header.template

@@ -0,0 +1,35 @@
+{% if mlComment != ""%}
+{$mlComment}
+
+{% endif %}
+{$commonHeader()}
+
+#if !defined({$commonStandardCGuardMacro})
+#define {$commonStandardCGuardMacro}
+
+#ifdef __cplusplus
+
+{% for inc in includes %}
+#include "{$inc}"
+{% endfor -- includes %}
+
+extern "C"
+{
+#endif
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include "erpc_version.h"
+{% if empty(crc16) == false %}
+#include "{$crcHeaderName}"
+{% endif  -- empty(crc16) == false %}
+
+{$checkVersion()}
+{$>checkCrc()}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // {$commonStandardCGuardMacro}

erpcgen/src/templates/c_server_header.template

@@ -7,7 +7,8 @@
 #if !defined({$serverCGuardMacro})
 #define {$serverCGuardMacro}
 
-#include "{$commonCHeaderName}"
+#include "{$commonStandardCHeaderName}"
+#include "{$commonErpcCHeaderName}"
 {% for iface in group.interfaces %}
 {%  for fn in iface.functions %}
 {%   for externalInterface in fn.externalInterfaces %}

erpcgen/src/templates/c_server_source.template

@@ -14,6 +14,7 @@
 
 using namespace erpc;
 using namespace std;
+{$usingNamespace() >}
 {% for iface in group.interfaces %}
 
 ERPC_MANUALLY_CONSTRUCTED_STATIC({$iface.serviceClassName}, s_{$iface.serviceClassName});

erpcgen/src/templates/cpp_client_header.template

@@ -10,14 +10,13 @@
 #include "{$interfaceCppHeaderName}"
 
 #include "erpc_client_manager.h"
+{$fillNamespaceBegin()>}
 
-namespace erpc {
 {% for iface in group.interfaces %}
-
 class {$iface.clientClassName}: public {$iface.interfaceClassName}
 {
     public:
-        {$iface.clientClassName}(ClientManager *manager);
+        {$iface.clientClassName}(erpc::ClientManager *manager);
 {% for fn in iface.functions if fn.isNonExternalFunction == true %}
 
 {% if fn.mlComment %}
@@ -27,10 +26,9 @@ class {$iface.clientClassName}: public {$iface.interfaceClassName}
 {% endfor -- fn %}
 
     protected:
-        ClientManager *m_clientManager;
+        erpc::ClientManager *m_clientManager;
 };
-{% endfor -- iface %}
-
-} // namespace erpc
 
+{% endfor -- iface %}
+{$fillNamespaceEnd()}
 #endif // {$clientCppGuardMacro}

erpcgen/src/templates/cpp_client_source.template

@@ -16,7 +16,7 @@ extern "C"
 {% if groupNames %}
 // import callbacks declaration from other groups
 {%  for name in groupNames if name != group.name %}
-#include "{$outputFilename}_{$name}_common.h"
+#include "{$outputFilename}_{$name}_common_erpc.h"
 {%  endfor %}
 {% endif %}
 }
@@ -25,6 +25,7 @@ extern "C"
 {$>checkCrc()}
 using namespace erpc;
 using namespace std;
+{$usingNamespace() >}
 {$generateCrcVariable()}
 {$> setSharedMemAddresses()}
 {$> constantsDefinitions(consts)}

erpcgen/src/templates/cpp_common_functions.template

@@ -32,6 +32,28 @@ extern const uint32_t erpc_generated_crc = {$crc16};
 {% endif  -- empty(crc16) == false %}
 {% enddef --checkCrc %}
 
+{# ---------------- namespace ---------------- #}
+{% def fillNamespaceBegin() %}
+{% if empty(namespace) == false %}
+
+namespace {$namespace}
+{
+{% endif  -- empty(crc16) == false %}
+{% enddef --checkCrc %}
+
+{% def fillNamespaceEnd() %}
+{% if empty(namespace) == false %}
+} // {$namespace}
+
+{% endif  -- empty(crc16) == false %}
+{% enddef --checkCrc %}
+
+{% def usingNamespace() %}
+{% if empty(namespace) == false %}
+using namespace {$namespace};
+{% endif  -- empty(crc16) == false %}
+{% enddef --checkCrc %}
+
 {# ---------------- constantsDefinitions ---------------- #}
 {% def constantsDefinitions(consts) %}
 {% if not empty(consts) %}

erpcgen/src/templates/cpp_interface_header.template

@@ -7,8 +7,7 @@
 #if !defined({$interfaceCppGuardMacro})
 #define {$interfaceCppGuardMacro}
 
-#include "{$commonCHeaderName}"
-
+#include "{$commonStandardCHeaderName}"
 {% for iface in group.interfaces %}
 {%  for fn in iface.functions %}
 {%   for externalInterface in fn.externalInterfaces %}
@@ -20,8 +19,8 @@
 {%   endfor -- externalInterface %}
 {%  endfor -- fn %}
 {% endfor -- iface %}
-
-namespace erpc {
+{$fillNamespaceBegin()}
+#include "{$commonErpcCHeaderName}"
 {% for iface in group.interfaces %}
 
 // Abstract base class for {$iface.name}
@@ -56,7 +55,5 @@ private:
 {% endfor %}
 };
 {% endfor -- iface %}
-
-} // namespace erpc
-
+{$fillNamespaceEnd()}
 #endif // {$interfaceCppGuardMacro}

erpcgen/src/templates/cpp_interface_source.template

@@ -3,8 +3,8 @@
 {$checkVersion()}
 {$>checkCrc()}
 
-using namespace erpc;
 using namespace std;
+{$usingNamespace() >}
 
 {% for iface in group.interfaces -- service subclass method impl %}
 {%  for cb in iface.callbacksInt %}