[Docstring-checkins] CVS: dps/dps nodes.py,1.24,1.25

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

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

Modified Files:
	nodes.py 
Log Message:
  - Simplified target record keeping.

Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** nodes.py	2002/01/29 02:17:18	1.24
--- nodes.py	2002/01/30 04:52:09	1.25
***************
*** 439,450 ****
  
          self.explicit_targets = {}
!         """Mapping of target names to lists of explicit target nodes."""
  
          self.implicit_targets = {}
!         """Mapping of target names to lists of implicit (internal) target
          nodes."""
  
          self.external_targets = {}
!         """Mapping of target names to lists of external target nodes."""
  
          self.indirect_targets = {}
--- 439,450 ----
  
          self.explicit_targets = {}
!         """Mapping of target names to explicit target nodes."""
  
          self.implicit_targets = {}
!         """Mapping of target names to implicit (internal) target
          nodes."""
  
          self.external_targets = {}
!         """Mapping of target names to external target nodes."""
  
          self.indirect_targets = {}
***************
*** 455,465 ****
  
          self.refnames = {}
!         """Mapping of reference names to reference nodes."""
  
          self.substitution_refs = {}
!         """Mapping of substitution names to substitution_reference nodes."""
  
          self.footnote_refs = {}
!         """Mapping of footnote labels to footnote_reference nodes."""
  
          self.anonymous_targets = []
--- 455,466 ----
  
          self.refnames = {}
!         """Mapping of reference names to lists of reference nodes."""
  
          self.substitution_refs = {}
!         """Mapping of substitution names to lists of substitution_reference
!         nodes."""
  
          self.footnote_refs = {}
!         """Mapping of footnote labels to lists of footnote_reference nodes."""
  
          self.anonymous_targets = []
***************
*** 499,503 ****
              del targetnode['name']
              targetnode['dupname'] = name
!         self.implicit_targets.setdefault(name, []).append(targetnode)
  
      def note_explicit_target(self, targetnode, innode=None):
--- 500,504 ----
              del targetnode['name']
              targetnode['dupname'] = name
!         self.implicit_targets[name] = targetnode
  
      def note_explicit_target(self, targetnode, innode=None):
***************
*** 509,516 ****
              if targetnode.has_key('refuri'): # external target, dups OK
                  refuri = targetnode['refuri']
!                 for t in self.explicit_targets.get(name, []):
!                     if not t.has_key('refuri') or t['refuri'] != refuri:
!                         break
!                 else:
                      level = 0           # just inform if refuri's identical
              sw = self.reporter.system_warning(
--- 510,516 ----
              if targetnode.has_key('refuri'): # external target, dups OK
                  refuri = targetnode['refuri']
!                 t = self.explicit_targets[name]
!                 if t.has_key('name') and t.has_key('refuri') \
!                       and t['refuri'] == refuri:
                      level = 0           # just inform if refuri's identical
              sw = self.reporter.system_warning(
***************
*** 527,538 ****
              innode += sw
              self.clear_target_names(name, self.implicit_targets)
!         self.explicit_targets.setdefault(name, []).append(targetnode)
  
      def clear_target_names(self, name, *targetdicts):
          for targetdict in targetdicts:
!             for node in targetdict.get(name, []):
!                 if node.has_key('name'):
!                     node['dupname'] = node['name']
!                     del node['name']
  
      def note_refname(self, node):
--- 527,540 ----
              innode += sw
              self.clear_target_names(name, self.implicit_targets)
!         self.explicit_targets[name] = targetnode
  
      def clear_target_names(self, name, *targetdicts):
          for targetdict in targetdicts:
!             if not targetdict.has_key(name):
!                 continue
!             node = targetdict[name]
!             if node.has_key('name'):
!                 node['dupname'] = node['name']
!                 del node['name']
  
      def note_refname(self, node):
***************
*** 540,549 ****
  
      def note_external_target(self, targetnode):
!         self.external_targets.setdefault(
!               targetnode['name'], []).append(targetnode)
  
      def note_indirect_target(self, targetnode):
!         self.indirect_targets.setdefault(
!               targetnode['name'], []).append(targetnode)
          self.note_refname(targetnode)
  
--- 542,549 ----
  
      def note_external_target(self, targetnode):
!         self.external_targets[targetnode['name']] = targetnode
  
      def note_indirect_target(self, targetnode):
!         self.indirect_targets[targetnode['name']] = targetnode
          self.note_refname(targetnode)
  
***************
*** 747,753 ****
      def __init__(self, doctree):
          self.doctree = doctree
- 
-     def walk(self):
-         self.doctree.walk(self)
  
      # Save typing with dynamic definitions.
--- 747,750 ----