[certi-cvs] certi/scripts GenMsgCXX.py genallmsg.sh

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/03/28 16:07:43

Modified files:
        scripts        : GenMsgCXX.py 
Added files:
        scripts        : genallmsg.sh 

Log message:
        The virtual constructor generated by the message should launch
        appropriate exception.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/GenMsgCXX.py?cvsroot=certi&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/genallmsg.sh?cvsroot=certi&rev=1.1

Patches:
Index: GenMsgCXX.py
===================================================================
RCS file: /sources/certi/certi/scripts/GenMsgCXX.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- GenMsgCXX.py        23 Mar 2010 08:12:39 -0000      1.13
+++ GenMsgCXX.py        28 Mar 2010 16:07:43 -0000      1.14
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 ## USA
 ##
-## $Id: GenMsgCXX.py,v 1.13 2010/03/23 08:12:39 erk Exp $
+## $Id: GenMsgCXX.py,v 1.14 2010/03/28 16:07:43 erk Exp $
 ## ----------------------------------------------------------------------------
 
 """
@@ -411,8 +411,8 @@
             # begin public
             stream.write(self.getIndent()+"public:\n")            
             self.indent()            
-            stream.write(self.getIndent()+"static %s* %s(%s type) throw 
(RTIinternalError);\n"% self.AST.factory.creator)
-            stream.write(self.getIndent()+"static %s* %s(%s stream) throw 
(RTIinternalError);\n"% self.AST.factory.receiver)
+            stream.write(self.getIndent()+"static %s* %s(%s type) throw 
(NetworkError, NetworkSignal);\n"% self.AST.factory.creator)
+            stream.write(self.getIndent()+"static %s* %s(%s stream) throw 
(NetworkError, NetworkSignal);\n"% self.AST.factory.receiver)
             self.unIndent()
             #end public
             #begin protected
@@ -571,7 +571,7 @@
             
     def writeFactoryCreator(self,stream):
         creator = 
(self.AST.factory.creator[0],self.AST.factory.name)+self.AST.factory.creator[1:]
            
-        stream.write(self.getIndent()+"%s* %s::%s(%s type) throw 
(RTIinternalError) {\n"% creator)
+        stream.write(self.getIndent()+"%s* %s::%s(%s type) throw 
(NetworkError, NetworkSignal) {\n"% creator)
         self.indent()
         stream.write(self.getIndent()+"%s* msg = NULL;\n\n" % creator[0])
         stream.write(self.getIndent() + "switch (type) {\n")
@@ -581,7 +581,7 @@
                 stream.write(self.getIndent()+"case %s::%s:\n" % 
(creator[0],e.name.replace(self.replacePrefix[0],"",1)))                
             self.indent()
             if None==e.type:
-                stream.write(self.getIndent()+"throw RTIinternalError(\"%s 
message type should not be used!!\");\n"%e.name)
+                stream.write(self.getIndent()+"throw NetworkError(\"%s message 
type should not be used!!\");\n"%e.name)
             else:
                 stream.write(self.getIndent()+"msg = new %s();\n" % e.type)
             stream.write(self.getIndent()+"break;\n")
@@ -594,7 +594,7 @@
     
     def writeFactoryReceiver(self,stream):
         receiver = 
(self.AST.factory.receiver[0],self.AST.factory.name)+self.AST.factory.receiver[1:]
-        stream.write(self.getIndent()+"%s* %s::%s(%s stream) throw 
(RTIinternalError) {\n"% receiver)
+        stream.write(self.getIndent()+"%s* %s::%s(%s stream) throw 
(NetworkError, NetworkSignal) {\n"% receiver)
         self.indent()
         stream.write(self.getIndent()+self.commentLineBeginWith+" FIXME This 
is not thread safe\n")
         stream.write(self.getIndent()+"static MessageBuffer msgBuffer;\n")

Index: genallmsg.sh
===================================================================
RCS file: genallmsg.sh
diff -N genallmsg.sh
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ genallmsg.sh        28 Mar 2010 16:07:40 -0000      1.1
@@ -0,0 +1,5 @@
+#!/bin/sh
+./GenerateMessages.py --input=CERTI_NetworkMessage.msg 
--language=CXXCERTINetworkMessage --type=header 
--output=../libCERTI/NM_Classes.hh
+./GenerateMessages.py --input=CERTI_NetworkMessage.msg 
--language=CXXCERTINetworkMessage --type=body --output=../libCERTI/NM_Classes.cc
+./GenerateMessages.py --input=CERTI_Message.msg --language=CXXCERTIMessage 
--type=header --output=../libCERTI/M_Classes.hh
+./GenerateMessages.py --input=CERTI_Message.msg --language=CXXCERTIMessage 
--type=body --output=../libCERTI/M_Classes.cc
\ No newline at end of file