提交: fd950b81ea5c2bac9a0287fb4d61bdfec213b904 - CC-Castle (hg)

Commit MetaInfo

• 修订版: fd950b81ea5c2bac9a0287fb4d61bdfec213b904 (tree)
• 时间: 2013-11-02 21:08:07
• 作者: Albert Mietus < albert AT ons-huis DOT net >
• Commiter: Albert Mietus < albert AT ons-huis DOT net >

Log Message

More logging.*

更改概述

• modified: compiler/py/donjon/ast/astBase.py
• modified: compiler/py/donjon/ast/protocol.py
• modified: compiler/py/donjon/ast/types.py
• modified: compiler/py/donjon/aux/graphviz.py
• modified: compiler/py/donjon/aux/parseLib.py
• modified: compiler/py/donjon/sdg/vsymbols.py

差异

diff -r de2c99b913e0 -r fd950b81ea5c compiler/py/donjon/ast/astBase.py
--- a/compiler/py/donjon/ast/astBase.py	Thu Oct 31 23:20:51 2013 +0100
+++ b/compiler/py/donjon/ast/astBase.py	Sat Nov 02 13:08:07 2013 +0100
@@ -4,6 +4,8 @@
 
 from ..ccBase import CCBase
 
+import logging
+
 class ASTBaseBase(CCBase):
     """Base-Base for all AST-Nodes. Most nodes will inherit from ASTBase, but some do not.
 
@@ -29,7 +31,7 @@
         super(ASTBase,self).__init__()
 
         if len(DEBUG & set(('all', 'ALL', self.__class__.__name__, 'AST',' AST2', 'init'))):
-            print 'DEBUG %s::super.init(%s;%s)' % (self.__class__.__name__, self._node_no(), ",".join(str(arg) for arg in args))
+            logging.debug ('%s::super.init(%s;%s)' % (self.__class__.__name__, self._node_no(), ",".join(str(arg) for arg in args)))
 
     def walk(self, topdown=True, _top=None):
         """Walk over the complete AST2, in an 'os.walk()' style (Generator)
@@ -45,12 +47,11 @@
 
 
         if len(DEBUG & set(('all', 'ALL', 'walk'))):
-            print "DEBUG {type:>50}.walk()\t {node}".format(type=type(self),node=self)
+            logging.debug("{type:>50}.walk()\t {node}".format(type=type(self),node=self))
         descendants = self._descendants()
         for d in descendants:
             if not isinstance(d, ASTBase):
-                import sys
-                print >>sys.stderr, "WARNING walk(): descendant '{d}' (type={type}) of node '{node}' ({no}) is not ASTBase-derived. Skipping it".format(d=d,type=type(d), node=repr(self), no=self._node_no())
+                logging.error("WARNING walk(): descendant '{d}' (type={type}) of node '{node}' ({no}) is not ASTBase-derived. Skipping it".format(d=d,type=type(d), node=repr(self), no=self._node_no()))
                 descendants.remove(d)
         if topdown:
             yield self,_top,descendants
@@ -95,10 +96,8 @@
         try:
             child_lines = "\n".join([c.dump(indent_with=indent_with, indent_level=indent_level+1) for c in self.childs])
             return ("childs=[\n" +  child_lines + "]" ) if len(self.childs)>0 else ""
-        except AttributeError:
-            import sys
-            print >>sys.stderr,"LOG: can't dumpChilds of %s" % self
-            # Probally .childs isn't set yet
+        except AttributeError:          # Probally .childs isn't set yet
+            logging.error("Can't dumpChilds of %s" % self)
             return ""
 
     def _descendants(self):

diff -r de2c99b913e0 -r fd950b81ea5c compiler/py/donjon/ast/protocol.py
--- a/compiler/py/donjon/ast/protocol.py	Thu Oct 31 23:20:51 2013 +0100
+++ b/compiler/py/donjon/ast/protocol.py	Sat Nov 02 13:08:07 2013 +0100
@@ -8,6 +8,7 @@
 from .astBase import ASTBase
 from ..ccBase import CCmixInNamed
 
+import logging
 
 class ProtocolKindBase(ASTBase): pass  # Event and such ...
 
@@ -28,11 +29,11 @@
     def setKind(self, kind):
         if self.kind == UNKNOWN:
             self.kind = kind
-        else: print "ERROR: Protocol-kind already set to %s. Ignored" % kinds.name(self.kind)
+        else: logging.error("Protocol-kind already set to %s. Ignored" % kinds.name(self.kind))
 
     def append(self, child):
         if self.kind is child.kind: super(Protocol,self).append(child)
-        else: print "Error, can append %s to %s-Protocol. Ignored!" % (kinds.name(child.kind), kinds.name(self.kind))
+        else: logging.error("Can append %s to %s-Protocol. Ignored!" % (kinds.name(child.kind), kinds.name(self.kind)))
 
 
 class Event(ProtocolKindBase, CCmixInNamed):

diff -r de2c99b913e0 -r fd950b81ea5c compiler/py/donjon/ast/types.py
--- a/compiler/py/donjon/ast/types.py	Thu Oct 31 23:20:51 2013 +0100
+++ b/compiler/py/donjon/ast/types.py	Sat Nov 02 13:08:07 2013 +0100
@@ -97,8 +97,6 @@
         else: # typespec is a sequence: so it becomes a MACRO type
             super(Type, self).__init__(None, id=ALL_TYPES._MACRO)
             self.sub_types = tuple([Type(e) for e in typespec])
-#        import sys
-#        print >> sys.stderr, 'XXX', self.__dict__
 
     def __repr__ (self, prefix=True):
         retval =""

diff -r de2c99b913e0 -r fd950b81ea5c compiler/py/donjon/aux/graphviz.py
--- a/compiler/py/donjon/aux/graphviz.py	Thu Oct 31 23:20:51 2013 +0100
+++ b/compiler/py/donjon/aux/graphviz.py	Sat Nov 02 13:08:07 2013 +0100
@@ -5,6 +5,8 @@
 from donjon.ccBase import CCBase
 from donjon.sdg import vsymbols
 
+import logging
+
 def _GVid(node):
     return  node.className().replace('.','_DOT_') + '_' + str(node._node_no())
 
@@ -140,7 +142,7 @@
                     MemberBase:    ',shape=cds',
                     }
     except ImportError as e:
-        print "Can't create MARKERS:", e
+        logging.error("Can't create MARKERS: %s"% e)
         MARKERS={}
 
     m = ''

diff -r de2c99b913e0 -r fd950b81ea5c compiler/py/donjon/aux/parseLib.py
--- a/compiler/py/donjon/aux/parseLib.py	Thu Oct 31 23:20:51 2013 +0100
+++ b/compiler/py/donjon/aux/parseLib.py	Sat Nov 02 13:08:07 2013 +0100
@@ -1,6 +1,5 @@
 # Copyright (C) ALbert Mietus, SoftwareBeterMaken.nl; 2013. Part of Castle-project
 
-import sys
 import logging
 
 USE_CPICKLE=True                                                        # cPickle-2.7 has a assert bug!
@@ -18,7 +17,7 @@
         parser      = CastleParser(tokens)
         ast1        = parser.parse(src)
     except IOError,e:
-        print >> sys.stderr, "IO Error:", e, "for file:", src
+        logging.error("IO Error: %s for file:%s", e, src)
         return
 
     # Walk the ast1: to produce the ast2. which also checks the ast1
@@ -37,14 +36,14 @@
         gvfile=file(filename, 'w')
         gvfile.write("%s" % gen.toDOT(ast1.tree))
     except IOError,e:
-        print >> sys.stderr, "IO Error:", e,
+        logging.error("IO Error: %s", e)
 
 def ast2_dump(ast2, filename):
     try:
         dumpfile=file(filename, 'w')
         dumpfile.write(ast2.dump(indent_with="\t", indent_level=0))
     except IOError,e:
-        print >> sys.stderr, "IO Error:", e,
+        logging.error("IO Error: %s", e)
 
 def ast2_GV(ast2, filename):
     import donjon.aux.graphviz as graphviz
@@ -52,7 +51,7 @@
         gvfile=file(filename, 'w')
         gvfile.write(graphviz.dumpGV(ast2,header=True))
     except IOError,e:
-        print >> sys.stderr, "IO Error:", e,
+        logging.error("IO Error: %s", e)
 
 
 def ast2_pickle(ast2, filename):
@@ -64,7 +63,7 @@
         pickle.dump(ast2,picklefile, -1)
         pickle.dump(CCBase._node_counter,picklefile, -1)
     except IOError,e:
-        print >> sys.stderr, "IO Error:", e,
+        logging.error("IO Error: %s", e)
 
 
 def ast2_unpickle(ast2_filename):
@@ -77,8 +76,7 @@
         CCBase._node_counter = pickle.load(picklefile)
         return ast2
     except IOError,e:
-        import sys
-        print >> sys.stderr, "IO Error:", e,
+        logging.error("IO Error: %s", e)
 
 
 def AST2debug(debug_options):

diff -r de2c99b913e0 -r fd950b81ea5c compiler/py/donjon/sdg/vsymbols.py
--- a/compiler/py/donjon/sdg/vsymbols.py	Thu Oct 31 23:20:51 2013 +0100
+++ b/compiler/py/donjon/sdg/vsymbols.py	Sat Nov 02 13:08:07 2013 +0100
@@ -9,6 +9,8 @@
 from donjon.ast.implementation import Implement
 from ..ccBase import CCmixInNamed
 
+import logging
+
 class VirtSymBase(SDGBase, CCmixInNamed):
     __str__ = CCmixInNamed.getName
 
@@ -49,6 +51,6 @@
         elif isinstance(side, Component) and self.component is None:
             self.component = side
         else:
-            print "ERROR: Can't add %s to correct side of %s vsymbol (%)" % (side, type(self), self.getName())
+            logging.error("Can't add %s to correct side of %s vsymbol (%)" % (side, type(self), self.getName()))