@@ -31,13 +31,17 @@ static const char *const kIdentifierChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHI
3131
3232// Templates strings converted from text files by txt_to_c.py.
3333extern const char *const kCCommonHeader ;
34- extern const char *const kCInterfaceHeader ;
34+ extern const char *const kCppInterfaceHeader ;
35+ extern const char *const kCppClientHeader ;
36+ extern const char *const kCppClientSource ;
37+ extern const char *const kCppServerHeader ;
38+ extern const char *const kCppServerSource ;
39+ extern const char *const kCppCoders ;
40+ extern const char *const kCppCommonFunctions ;
3541extern const char *const kCClientHeader ;
3642extern const char *const kCClientSource ;
3743extern const char *const kCServerHeader ;
3844extern const char *const kCServerSource ;
39- extern const char *const kCCoders ;
40- extern const char *const kCCommonFunctions ;
4145extern const char *const kCCrc ;
4246
4347// number which makes list temporary variables unique.
@@ -48,7 +52,6 @@ static uint8_t listCounter = 0;
4852// //////////////////////////////////////////////////////////////////////////////
4953CGenerator::CGenerator (InterfaceDefinition *def)
5054: Generator(def, kC )
51- , m_generateC(true )
5255{
5356 /* Set copyright rules. */
5457 if (m_def->hasProgramSymbol ())
@@ -71,78 +74,114 @@ CGenerator::CGenerator(InterfaceDefinition *def)
7174 initCReservedWords ();
7275}
7376
74- void CGenerator::generateCpp (void )
75- {
76- m_generateC=false ;
77- this ->generate ();
78- }
79-
8077void CGenerator::generateOutputFiles (const string &fileName)
8178{
82- generateCommonHeaderFiles (fileName);
79+ generateCommonCHeaderFiles (fileName);
80+
81+ generateInterfaceCppHeaderFile (fileName);
8382
84- generateInterfaceHeaderFile (fileName);
83+ generateClientCppHeaderFile (fileName);
84+ generateClientCppSourceFile (fileName);
8585
86- generateClientHeaderFile (fileName);
87- generateClientSourceFile (fileName);
86+ generateServerCppHeaderFile (fileName);
87+ generateServerCppSourceFile (fileName);
8888
89- generateServerHeaderFile (fileName);
90- generateServerSourceFile (fileName);
89+ generateClientCHeaderFile (fileName);
90+ generateClientCSourceFile (fileName);
91+
92+ generateServerCHeaderFile (fileName);
93+ generateServerCSourceFile (fileName);
9194}
9295
93- void CGenerator::generateCommonHeaderFiles (string fileName)
96+ void CGenerator::generateCommonCHeaderFiles (string fileName)
9497{
9598 fileName += " _common.h"
96- m_templateData[" commonGuardMacro " generateIncludeGuardName (fileName);
97- m_templateData[" commonHeaderName "
99+ m_templateData[" commonCGuardMacro " generateIncludeGuardName (fileName);
100+ m_templateData[" commonCHeaderName "
98101 generateOutputFile (fileName , " c_common_header" kCCommonHeader );
99102}
100103
101- void CGenerator::generateInterfaceHeaderFile (string fileName)
104+ void CGenerator::generateInterfaceCppHeaderFile (string fileName)
102105{
103- fileName += " _interface.h "
104- m_templateData[" interfaceGuardMacro " generateIncludeGuardName (fileName);
105- m_templateData[" interfaceHeaderName "
106- generateOutputFile (fileName, " c_interface_header " kCInterfaceHeader );
106+ fileName += " _interface.hpp "
107+ m_templateData[" interfaceCppGuardMacro " generateIncludeGuardName (fileName);
108+ m_templateData[" interfaceCppHeaderName "
109+ generateOutputFile (fileName, " cpp_interface_header " kCppInterfaceHeader );
107110}
108111
109- void CGenerator::generateClientHeaderFile (string fileName)
112+ void CGenerator::generateClientCppHeaderFile (string fileName)
110113{
111- fileName += " _client.h "
112- m_templateData[" clientGuardMacro " generateIncludeGuardName (fileName);
113- m_templateData[" clientHeaderName "
114- generateOutputFile (fileName, " c_client_header " kCClientHeader );
114+ fileName += " _client.hpp "
115+ m_templateData[" clientCppGuardMacro " generateIncludeGuardName (fileName);
116+ m_templateData[" clientCppHeaderName "
117+ generateOutputFile (fileName, " cpp_client_header " kCppClientHeader );
115118}
116119
117- void CGenerator::generateClientSourceFile (string fileName)
120+ void CGenerator::generateClientCppSourceFile (string fileName)
118121{
119- m_templateData[" source" " client"
120122 fileName += " _client.cpp"
121- m_templateData[" clientSourceName "
123+ m_templateData[" clientCppSourceName "
122124
123125 // TODO: temporary workaround for tests
124126 m_templateData[" unitTest" compare (" test_unit_test_common_client.cpp" 0 ? false : true );
125127
126- generateOutputFile (fileName, " c_client_source " kCClientSource );
128+ generateOutputFile (fileName, " cpp_client_source " kCppClientSource );
127129}
128130
129- void CGenerator::generateServerHeaderFile (string fileName)
131+ void CGenerator::generateServerCppHeaderFile (string fileName)
130132{
131- fileName += " _server.h "
132- m_templateData[" serverGuardMacro " generateIncludeGuardName (fileName);
133- m_templateData[" serverHeaderName "
134- generateOutputFile (fileName, " c_server_header " kCServerHeader );
133+ fileName += " _server.hpp "
134+ m_templateData[" serverCppGuardMacro " generateIncludeGuardName (fileName);
135+ m_templateData[" serverCppHeaderName "
136+ generateOutputFile (fileName, " cpp_server_header " kCppServerHeader );
135137}
136138
137- void CGenerator::generateServerSourceFile (string fileName)
139+ void CGenerator::generateServerCppSourceFile (string fileName)
138140{
139- m_templateData[" source" " server"
140141 fileName += " _server.cpp"
141- m_templateData[" serverSourceName "
142+ m_templateData[" serverCppSourceName "
142143
143144 // TODO: temporary workaround for tests
144145 m_templateData[" unitTest" compare (" test_unit_test_common_server.cpp" 0 ? false : true );
145146
147+ generateOutputFile (fileName, " cpp_server_source" kCppServerSource );
148+ }
149+
150+ void CGenerator::generateClientCHeaderFile (string fileName)
151+ {
152+ fileName =" c_" " _client.h"
153+ m_templateData[" clientCGuardMacro" generateIncludeGuardName (fileName);
154+ m_templateData[" clientCHeaderName"
155+ generateOutputFile (fileName, " c_client_header" kCClientHeader );
156+ }
157+
158+ void CGenerator::generateClientCSourceFile (string fileName)
159+ {
160+ fileName =" c_" " _client.cpp"
161+ m_templateData[" clientCSourceName"
162+
163+ // TODO: temporary workaround for tests
164+ m_templateData[" unitTest" compare (" c_test_unit_test_common_client.cpp" 0 ? false : true );
165+
166+ generateOutputFile (fileName, " c_client_source" kCClientSource );
167+ }
168+
169+ void CGenerator::generateServerCHeaderFile (string fileName)
170+ {
171+ fileName =" c_" " _server.h"
172+ m_templateData[" serverCGuardMacro" generateIncludeGuardName (fileName);
173+ m_templateData[" serverCHeaderName"
174+ generateOutputFile (fileName, " c_server_header" kCServerHeader );
175+ }
176+
177+ void CGenerator::generateServerCSourceFile (string fileName)
178+ {
179+ fileName =" c_" " _server.cpp"
180+ m_templateData[" serverCSourceName"
181+
182+ // TODO: temporary workaround for tests
183+ m_templateData[" unitTest" compare (" c_test_unit_test_common_server.cpp" 0 ? false : true );
184+
146185 generateOutputFile (fileName, " c_server_source" kCServerSource );
147186}
148187
@@ -155,12 +194,12 @@ void CGenerator::generateCrcFile()
155194
156195void CGenerator::parseSubtemplates ()
157196{
158- string templateName = " c_coders "
197+ string templateName = " cpp_coders "
159198 try
160199 {
161- parse (kCCoders , m_templateData);
162- templateName = " c_common_functions "
163- parse (kCCommonFunctions , m_templateData);
200+ parse (kCppCoders , m_templateData);
201+ templateName = " cpp_common_functions "
202+ parse (kCppCommonFunctions , m_templateData);
164203 }
165204 catch (TemplateException &e)
166205 {
@@ -1918,8 +1957,9 @@ string CGenerator::getFunctionServerCall(Function *fn, FunctionType *functionTyp
19181957 string proto = " "
19191958 if (!fn->getReturnType ()->isVoid () && prefix.length ()>0 )
19201959 {
1921- proto += " result = " +prefix ;
1960+ proto += " result = "
19221961 }
1962+ proto += prefix;
19231963 proto += getOutputName (fn);
19241964 proto += " ("
19251965
0 commit comments