[certi-cvs] certi/scripts GenMsgAST.py GenerateMessages.py

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/05/16 08:29:00

Modified files:
        scripts        : GenMsgAST.py GenerateMessages.py 

Log message:
        Merge from Lucas
        Improve Error Checking

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/GenMsgAST.py?cvsroot=certi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/GenerateMessages.py?cvsroot=certi&r1=1.36&r2=1.37

Patches:
Index: GenMsgAST.py
===================================================================
RCS file: /sources/certi/certi/scripts/GenMsgAST.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- GenMsgAST.py        14 Mar 2010 15:35:54 -0000      1.6
+++ GenMsgAST.py        16 May 2010 08:29:00 -0000      1.7
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 ## USA
 ##
-## $Id: GenMsgAST.py,v 1.6 2010/03/14 15:35:54 gotthardp Exp $
+## $Id: GenMsgAST.py,v 1.7 2010/05/16 08:29:00 erk Exp $
 ## ----------------------------------------------------------------------------
 
 """
@@ -487,14 +487,17 @@
             if not AST.isDefined(f.typeid):
                 self.logger.fatal("The type <%s> used for field <%s.%s> is 
unknown (not a builtin, nor native, nor message)" % (f.typeid,msg.name,f.name))
                 self.logger.fatal(" --> Check lines (%d,%d)" % (f.linespan) + 
" of <%s>" % AST.name)                
-                return
+                return False
             else:
                 if (isinstance(f,MessageType.MessageField)):                   
                     f.typeid = AST.getType(f.typeid)
                 elif (isinstance(f,MessageType.CombinedField)):
-                    self.checkMessageFields(f,AST)
+                    if (not self.checkMessageFields(f,AST)):
+                       return False
                 else:
                     self.logger.fatal("Unknown MessageField type %s" % f.str())
+                   return False
+        return True
                     
                 
     def check(self,AST):
@@ -530,7 +533,8 @@
                 enumval      = EnumType.EnumValue(msg.name.upper(),None)
                 enumval.type = msg.name
                 msgTypeEnumVals.append(enumval)
-            self.checkMessageFields(msg,AST)            
+            if not self.checkMessageFields(msg,AST):
+               return            
         enumval      = EnumType.EnumValue("LAST",None)
         enumval.type = None                                    
         msgTypeEnumVals.append(enumval)

Index: GenerateMessages.py
===================================================================
RCS file: /sources/certi/certi/scripts/GenerateMessages.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- GenerateMessages.py 14 Mar 2010 15:35:54 -0000      1.36
+++ GenerateMessages.py 16 May 2010 08:29:00 -0000      1.37
@@ -19,7 +19,7 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 ## USA
 ##
-## $Id: GenerateMessages.py,v 1.36 2010/03/14 15:35:54 gotthardp Exp $
+## $Id: GenerateMessages.py,v 1.37 2010/05/16 08:29:00 erk Exp $
 ## ----------------------------------------------------------------------------
 
 """
@@ -527,7 +527,7 @@
     
 lexer.lineno = 1
 parser.AST = GenMsgAST.MessageAST(inputFile)
-parser.parse(msgFile.read(),lexer=lexer)
+parser.parse(msgFile.read(),lexer=lexer,tracking=True)
 parser.AST.messages.reverse()
 parser.AST.enums.reverse()
 parser.AST.natives.reverse()