[Docstring-checkins] CVS: dps/dps nodes.py,1.1.1.1,1.2

[David G. <go...@us...>]

Update of /cvsroot/docstring/dps/dps
In directory usw-pr-cvs1:/tmp/cvs-serv12794/dps/dps

Modified Files:
	nodes.py 
Log Message:
  - Added vms_option.
  - Fixed link bookkeeping.

Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** nodes.py	2001/07/22 22:35:51	1.1.1.1
--- nodes.py	2001/08/22 04:10:11	1.2
***************
*** 2,10 ****
  
  """
! Author: David Goodger
! Contact: dgo...@bi...
! Revision: $Revision$
! Date: $Date$
! Copyright: This module has been placed in the public domain.
  
  """
--- 2,10 ----
  
  """
! :Author: David Goodger
! :Contact: dgo...@bi...
! :Revision: $Revision$
! :Date: $Date$
! :Copyright: This module has been placed in the public domain.
  
  """
***************
*** 243,247 ****
              innode += sw
              self.clearlinknames(name, self.implicitlinks)
!             self.implicitlinks[name].append(linknode)
          else:
              self.implicitlinks[name] = [linknode]
--- 243,247 ----
              innode += sw
              self.clearlinknames(name, self.implicitlinks)
!             self.implicitlinks.setdefault(name, []).append(linknode)
          else:
              self.implicitlinks[name] = [linknode]
***************
*** 251,260 ****
          if innode == None:
              innode = linknode
!         if self.explicitlinks.has_key(name) or self.indirectlinks.has_key(name):
              sw = self.errorhandler.system_warning(
                    1, 'duplicate explicit link name: "%s"' % name)
              innode += sw
!             self.clearlinknames(name, self.explicitlinks, self.implicitlinks)
!             self.explicitlinks[name].append(linknode)
              return
          elif self.implicitlinks.has_key(name):
--- 251,261 ----
          if innode == None:
              innode = linknode
!         if self.explicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
                    1, 'duplicate explicit link name: "%s"' % name)
              innode += sw
!             self.clearlinknames(name, self.explicitlinks, self.implicitlinks,
!                                 self.indirectlinks)
!             self.explicitlinks.setdefault(name, []).append(linknode)
              return
          elif self.implicitlinks.has_key(name):
***************
*** 276,286 ****
  
      def addindirectlink(self, name, reference, linknode, innode):
!         if self.explicitlinks.has_key(name) \
!               or self.indirectlinks.has_key(name) \
!               or self.implicitlinks.has_key(name):
              sw = self.errorhandler.system_warning(
!                   1, 'duplicate indirect link name: "%s"' % name)
              innode += sw
!         self.indirectlinks[name] = reference
          linknode['name'] = name
  
--- 277,303 ----
  
      def addindirectlink(self, name, reference, linknode, innode):
!         #print >>sys.stderr, 'Adding indirect link: %s -> %s' % (name, reference)
!         #print >>sys.stderr, 'self.indirectlinks=%r' % self.indirectlinks
!         #print >>sys.stderr, 'self.explicitlinks=%r' % self.explicitlinks
!         if self.explicitlinks.has_key(name):
!             #print >>sys.stderr, "already has explicit link"
!             level = 0
!             for t in self.explicitlinks.get(name, []):
!                 if len(t) != 1 or str(t[0]) != reference:
!                     level = 1
!                     break
              sw = self.errorhandler.system_warning(
!                   level, 'duplicate indirect link name: "%s"' % name)
              innode += sw
!             self.clearlinknames(name, self.explicitlinks, self.indirectlinks,
!                                 self.implicitlinks)
!         elif self.implicitlinks.has_key(name):
!             print >>sys.stderr, "already has explicit link"
!             sw = self.errorhandler.system_warning(
!                   0, 'duplicate implicit link name: "%s"' % name)
!             innode += sw
!             self.clearlinknames(name, self.implicitlinks)
!         self.indirectlinks.setdefault(name, []).append(linknode)
!         self.explicitlinks.setdefault(name, []).append(linknode)
          linknode['name'] = name
  
***************
*** 392,395 ****
--- 409,413 ----
  class short_option(_TextElement): pass
  class long_option(_TextElement): pass
+ class vms_option(_TextElement): pass
  class option_argument(_TextElement): pass
  class description(_Element): pass