[certi-cvs] certi libCERTI/NM_Classes.hh libCERTI/NM_Classe...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/03/23 08:12:39

Modified files:
        libCERTI       : NM_Classes.hh NM_Classes.cc M_Classes.hh 
                         M_Classes.cc 
        scripts        : GenMsgCXX.py 

Log message:
        Stupid mistake.
        optional field was sometimes send/received because
        _hasXXXX were not initialized

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.hh?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/NM_Classes.cc?cvsroot=certi&r1=3.23&r2=3.24
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/M_Classes.hh?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/M_Classes.cc?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/GenMsgCXX.py?cvsroot=certi&r1=1.12&r2=1.13

Patches:
Index: libCERTI/NM_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.hh,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- libCERTI/NM_Classes.hh      20 Mar 2010 16:34:13 -0000      3.17
+++ libCERTI/NM_Classes.hh      23 Mar 2010 08:12:39 -0000      3.18
@@ -1,4 +1,4 @@
-// Generated on 2010 March Sat, 20 at 17:24:07 by the CERTI message generator
+// Generated on 2010 March Tue, 23 at 08:56:33 by the CERTI message generator
 #ifndef NM_CLASSES_HH
 #define NM_CLASSES_HH
 // ****-**** Global System includes ****-****

Index: libCERTI/NM_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/NM_Classes.cc,v
retrieving revision 3.23
retrieving revision 3.24
diff -u -b -r3.23 -r3.24
--- libCERTI/NM_Classes.cc      20 Mar 2010 16:34:13 -0000      3.23
+++ libCERTI/NM_Classes.cc      23 Mar 2010 08:12:39 -0000      3.24
@@ -1,4 +1,4 @@
-// Generated on 2010 March Sat, 20 at 17:24:14 by the CERTI message generator
+// Generated on 2010 March Tue, 23 at 08:56:31 by the CERTI message generator
 #include <vector>
 #include <string>
 #include "NM_Classes.hh"
@@ -1033,6 +1033,7 @@
       this->messageName = "NM_Register_Object";
       this->type = NetworkMessage::REGISTER_OBJECT;
       //objectClass= <no default value in message spec using builtin>
+      _hasObjectName=false;
       //objectName= <no default value in message spec using builtin>
       //object= <no default value in message spec using builtin>
    }
@@ -1113,6 +1114,7 @@
       //object= <no default value in message spec using builtin>
       //attributes= <no default value in message spec using builtin>
       //values= <no default value in message spec using builtin>
+      _hasEvent=false;
       //event= <no default value in message spec using builtin>
    }
 
@@ -1187,6 +1189,7 @@
       //object= <no default value in message spec using builtin>
       //attributes= <no default value in message spec using builtin>
       //values= <no default value in message spec using builtin>
+      _hasEvent=false;
       //event= <no default value in message spec using builtin>
    }
 
@@ -1327,6 +1330,7 @@
       //interactionClass= <no default value in message spec using builtin>
       //parameters= <no default value in message spec using builtin>
       //values= <no default value in message spec using builtin>
+      _hasEvent=false;
       //event= <no default value in message spec using builtin>
    }
 
@@ -1399,6 +1403,7 @@
       this->messageName = "NM_Delete_Object";
       this->type = NetworkMessage::DELETE_OBJECT;
       //object= <no default value in message spec using builtin>
+      _hasEvent=false;
       //event= <no default value in message spec using builtin>
    }
 
@@ -1442,6 +1447,7 @@
       this->type = NetworkMessage::REMOVE_OBJECT;
       //object= <no default value in message spec using builtin>
       //objectClass= <no default value in message spec using builtin>
+      _hasEvent=false;
       //event= <no default value in message spec using builtin>
    }
 
@@ -2281,6 +2287,7 @@
       //objectClass= <no default value in message spec using builtin>
       //attributes= <no default value in message spec using builtin>
       //region= <no default value in message spec using builtin>
+      _hasObjectInstanceName=false;
       //objectInstanceName= <no default value in message spec using builtin>
       //object= <no default value in message spec using builtin>
       DDM_bool=false;
@@ -2567,8 +2574,11 @@
 
    New_NetworkMessage::New_NetworkMessage() {
       type=0;
+      _hasDate=false;
       //date= <no default value in message spec using builtin>
+      _hasLabel=false;
       //label= <no default value in message spec using builtin>
+      _hasTag=false;
       //tag= <no default value in message spec using builtin>
    }
 

Index: libCERTI/M_Classes.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/M_Classes.hh,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- libCERTI/M_Classes.hh       20 Mar 2010 16:34:13 -0000      3.8
+++ libCERTI/M_Classes.hh       23 Mar 2010 08:12:39 -0000      3.9
@@ -1,4 +1,4 @@
-// Generated on 2010 March Sat, 20 at 17:25:05 by the CERTI message generator
+// Generated on 2010 March Tue, 23 at 08:59:14 by the CERTI message generator
 #ifndef M_CLASSES_HH
 #define M_CLASSES_HH
 // ****-**** Global System includes ****-****

Index: libCERTI/M_Classes.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/M_Classes.cc,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- libCERTI/M_Classes.cc       20 Mar 2010 16:34:13 -0000      3.8
+++ libCERTI/M_Classes.cc       23 Mar 2010 08:12:39 -0000      3.9
@@ -1,4 +1,4 @@
-// Generated on 2010 March Sat, 20 at 17:24:56 by the CERTI message generator
+// Generated on 2010 March Tue, 23 at 08:59:23 by the CERTI message generator
 #include <vector>
 #include <string>
 #include "M_Classes.hh"
@@ -882,6 +882,7 @@
       this->type = Message::REGISTER_OBJECT_INSTANCE;
       //objectClass= <no default value in message spec using builtin>
       //object= <no default value in message spec using builtin>
+      _hasObjectName=false;
       //objectName= <no default value in message spec using builtin>
    }
 
@@ -928,6 +929,7 @@
       //object= <no default value in message spec using builtin>
       //attributes= <no default value in message spec using builtin>
       //values= <no default value in message spec using builtin>
+      _hasEventRetraction=false;
       //eventRetraction= <no default value in message spec using builtin>
    }
 
@@ -1003,6 +1005,7 @@
       //objectClass= <no default value in message spec using builtin>
       //object= <no default value in message spec using builtin>
       //objectName= <no default value in message spec using builtin>
+      _hasEventRetraction=false;
       //eventRetraction= <no default value in message spec using builtin>
    }
 
@@ -1052,6 +1055,7 @@
       //object= <no default value in message spec using builtin>
       //attributes= <no default value in message spec using builtin>
       //values= <no default value in message spec using builtin>
+      _hasEventRetraction=false;
       //eventRetraction= <no default value in message spec using builtin>
    }
 
@@ -1128,6 +1132,7 @@
       //parameters= <no default value in message spec using builtin>
       //values= <no default value in message spec using builtin>
       //region= <no default value in message spec using builtin>
+      _hasEventRetraction=false;
       //eventRetraction= <no default value in message spec using builtin>
    }
 
@@ -1204,6 +1209,7 @@
       //parameters= <no default value in message spec using builtin>
       //values= <no default value in message spec using builtin>
       //region= <no default value in message spec using builtin>
+      _hasEventRetraction=false;
       //eventRetraction= <no default value in message spec using builtin>
    }
 
@@ -1279,6 +1285,7 @@
       //objectClass= <no default value in message spec using builtin>
       //object= <no default value in message spec using builtin>
       //objectName= <no default value in message spec using builtin>
+      _hasEventRetraction=false;
       //eventRetraction= <no default value in message spec using builtin>
    }
 
@@ -1357,6 +1364,7 @@
       //objectClass= <no default value in message spec using builtin>
       //object= <no default value in message spec using builtin>
       //objectName= <no default value in message spec using builtin>
+      _hasEventRetraction=false;
       //eventRetraction= <no default value in message spec using builtin>
    }
 
@@ -3122,6 +3130,7 @@
       this->type = Message::DDM_REGISTER_OBJECT;
       //objectClass= <no default value in message spec using builtin>
       //object= <no default value in message spec using builtin>
+      _hasObjectInstanceName=false;
       //objectInstanceName= <no default value in message spec using builtin>
       //attributes= <no default value in message spec using builtin>
    }

Index: scripts/GenMsgCXX.py
===================================================================
RCS file: /sources/certi/certi/scripts/GenMsgCXX.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- scripts/GenMsgCXX.py        20 Mar 2010 16:34:14 -0000      1.12
+++ scripts/GenMsgCXX.py        23 Mar 2010 08:12:39 -0000      1.13
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 ## USA
 ##
-## $Id: GenMsgCXX.py,v 1.12 2010/03/20 16:34:14 erk Exp $
+## $Id: GenMsgCXX.py,v 1.13 2010/03/23 08:12:39 erk Exp $
 ## ----------------------------------------------------------------------------
 
 """
@@ -435,6 +435,9 @@
         stream.write("#endif\n")
         
     def writeInitFieldStatement(self,stream,field):
+        if field.qualifier == "optional":
+            stream.write(self.getIndent())
+            stream.write("_has"+self.upperFirst(field.name)+"=false;\n")
         if field.hasDefaultValue():            
             stream.write(self.getIndent())
             stream.write(field.name+"="+str(field.defaultValue)+";\n")