gnue-common/src/logic GTrigger.py

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-common
Branch:         
Changes by:     Jason Cater <address@hidden>    03/07/21 22:25:00

Modified files:
        src/logic      : GTrigger.py 

Log message:
        when a trigger has a syntax error, show a well-formatted exception 
containing the name of the trigger so the developer can stand a chance of 
finding the darn thing

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/logic/GTrigger.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: gnue-common/src/logic/GTrigger.py
diff -c gnue-common/src/logic/GTrigger.py:1.34 
gnue-common/src/logic/GTrigger.py:1.35
*** gnue-common/src/logic/GTrigger.py:1.34      Fri Jun  6 20:52:37 2003
--- gnue-common/src/logic/GTrigger.py   Mon Jul 21 22:24:59 2003
***************
*** 42,48 ****
    def __init__(self, msg):
      self.msg = msg
  
- 
  class TriggerAbort:
    pass
  class TriggerStop:
--- 42,47 ----
***************
*** 88,94 ****
      if self.type != None:
        self._buildObject()
  
!     
    #
    # Must be at least a phase 2 init
    #
--- 87,93 ----
      if self.type != None:
        self._buildObject()
  
! 
    #
    # Must be at least a phase 2 init
    #
***************
*** 161,169 ****
      try:
        self._code = compile(revisedTriggerCode, '<string>', 'exec')
      except SyntaxError, err:
        GDebug.printMesg(0, "Syntax error in line %s of trigger in element ??" \
              % ( err.lineno ))
!       sys.exit()
  
      def thisTrigger(myself, code = self._code,
                      triggerns = self._triggerns,
--- 160,180 ----
      try:
        self._code = compile(revisedTriggerCode, '<string>', 'exec')
      except SyntaxError, err:
+       try:
+         name = self.name
+       except:
+         name = self.type
+ 
+ 
+       print dir(err)
        GDebug.printMesg(0, "Syntax error in line %s of trigger in element ??" \
              % ( err.lineno ))
!       msg = _('There is a syntax error in one of this document\'s 
triggers.\n\nTraceback:\n') + \
!             '  Trigger "%s" (%s), line %s' % (name, self.type, err.lineno - 
1) + "\n" + \
!             '    ' + err.text[:-1] + "\n" + \
!             '    ' + (' ' * err.offset) + '^\n' + \
!             'SyntaxError: ' + err.msg
!       raise ValueError, msg
  
      def thisTrigger(myself, code = self._code,
                      triggerns = self._triggerns,