[Docstring-checkins] CVS: dps/dps nodes.py,1.31,1.32

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

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

Modified Files:
	nodes.py 
Log Message:
  - Modified post-parse system message storage.

Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** nodes.py	21 Feb 2002 03:44:53 -0000	1.31
--- nodes.py	22 Feb 2002 02:11:14 -0000	1.32
***************
*** 179,185 ****
          self.extend(children)           # extend self.children w/ attributes
  
!         self.attributes = attributes
          """Dictionary of attribute {name: value}."""
  
          if self.tagname is None:
              self.tagname = self.__class__.__name__
--- 179,188 ----
          self.extend(children)           # extend self.children w/ attributes
  
!         self.attributes = {}
          """Dictionary of attribute {name: value}."""
  
+         for att, value in attributes.items():
+             self.attributes[att.lower()] = value
+ 
          if self.tagname is None:
              self.tagname = self.__class__.__name__
***************
*** 540,543 ****
--- 543,549 ----
          """Initial ID number."""
  
+         self.messages = Element()
+         """System messages generated after parsing."""
+ 
      def asdom(self, dom=xml.dom.minidom):
          domroot = dom.Document()
***************
*** 545,556 ****
          return domroot
  
!     def set_id(self, node, innode=None):
!         if innode == None:
!             innode = self
          if node.has_key('id'):
              id = node['id']
              if self.ids.has_key(id) and self.ids[id] is not node:
                  msg = self.reporter.error('Duplicate ID: "%s"' % id)
!                 innode += msg
          else:
              while 1:
--- 551,562 ----
          return domroot
  
!     def set_id(self, node, msgnode=None):
!         if msgnode == None:
!             msgnode = self.messages
          if node.has_key('id'):
              id = node['id']
              if self.ids.has_key(id) and self.ids[id] is not node:
                  msg = self.reporter.error('Duplicate ID: "%s"' % id)
!                 msgnode += msg
          else:
              while 1:
***************
*** 568,593 ****
                        'Multiple IDs for name "%s": "%s", "%s"'
                        % (name, self.nameids[name], id))
!                 innode += msg
              self.nameids[name] = id
  
!     def note_implicit_target(self, targetnode, innode=None):
          name = targetnode['name']
          if self.explicit_targets.has_key(name) \
                or self.external_targets.has_key(name) \
                or self.implicit_targets.has_key(name):
!             sw = self.reporter.info(
                    'Duplicate implicit target name: "%s"' % name)
!             if innode == None:
!                 innode = self
!             innode += sw
              self.clear_target_names(name, self.implicit_targets)
              del targetnode['name']
              targetnode['dupname'] = name
          self.implicit_targets[name] = targetnode
!         self.set_id(targetnode)
  
!     def note_explicit_target(self, targetnode, innode=None):
!         if innode == None:
!             innode = self
          name = targetnode['name']
          if self.explicit_targets.has_key(name):
--- 574,599 ----
                        'Multiple IDs for name "%s": "%s", "%s"'
                        % (name, self.nameids[name], id))
!                 msgnode += msg
              self.nameids[name] = id
  
!     def note_implicit_target(self, targetnode, msgnode=None):
!         if msgnode == None:
!             msgnode = self.messages
          name = targetnode['name']
          if self.explicit_targets.has_key(name) \
                or self.external_targets.has_key(name) \
                or self.implicit_targets.has_key(name):
!             msg = self.reporter.info(
                    'Duplicate implicit target name: "%s"' % name)
!             msgnode += msg
              self.clear_target_names(name, self.implicit_targets)
              del targetnode['name']
              targetnode['dupname'] = name
          self.implicit_targets[name] = targetnode
!         self.set_id(targetnode, msgnode)
  
!     def note_explicit_target(self, targetnode, msgnode=None):
!         if msgnode == None:
!             msgnode = self.messages
          name = targetnode['name']
          if self.explicit_targets.has_key(name):
***************
*** 599,605 ****
                        and t['refuri'] == refuri:
                      level = 1           # just inform if refuri's identical
!             sw = self.reporter.system_message(
                    level, 'Duplicate explicit target name: "%s"' % name)
!             innode += sw
              self.clear_target_names(name, self.explicit_targets,
                                      self.implicit_targets)
--- 605,611 ----
                        and t['refuri'] == refuri:
                      level = 1           # just inform if refuri's identical
!             msg = self.reporter.system_message(
                    level, 'Duplicate explicit target name: "%s"' % name)
!             msgnode += msg
              self.clear_target_names(name, self.explicit_targets,
                                      self.implicit_targets)
***************
*** 608,617 ****
                  targetnode['dupname'] = name
          elif self.implicit_targets.has_key(name):
!             sw = self.reporter.info(
                    'Duplicate implicit target name: "%s"' % name)
!             innode += sw
              self.clear_target_names(name, self.implicit_targets)
          self.explicit_targets[name] = targetnode
!         self.set_id(targetnode)
  
      def clear_target_names(self, name, *targetdicts):
--- 614,623 ----
                  targetnode['dupname'] = name
          elif self.implicit_targets.has_key(name):
!             msg = self.reporter.info(
                    'Duplicate implicit target name: "%s"' % name)
!             msgnode += msg
              self.clear_target_names(name, self.implicit_targets)
          self.explicit_targets[name] = targetnode
!         self.set_id(targetnode, msgnode)
  
      def clear_target_names(self, name, *targetdicts):
***************
*** 650,661 ****
          self.note_refname(refnode)
  
!     def note_substitution_def(self, substitutiondefnode, innode=None):
          name = substitutiondefnode['name']
          if self.substitution_defs.has_key(name):
!             sw = self.reporter.error(
                    'Duplicate substitution definition name: "%s"' % name)
!             if innode == None:
!                 innode = self
!             innode += sw
              oldnode = self.substitution_defs[name]
              oldnode['dupname'] = oldnode['name']
--- 656,667 ----
          self.note_refname(refnode)
  
!     def note_substitution_def(self, substitutiondefnode, msgnode=None):
          name = substitutiondefnode['name']
          if self.substitution_defs.has_key(name):
!             msg = self.reporter.error(
                    'Duplicate substitution definition name: "%s"' % name)
!             if msgnode == None:
!                 msgnode = self.messages
!             msgnode += msg
              oldnode = self.substitution_defs[name]
              oldnode['dupname'] = oldnode['name']