Update of /cvsroot/docstring/dps/dps
In directory usw-pr-cvs1:/tmp/cvs-serv14083/dps/dps
Modified Files:
nodes.py
Log Message:
- Added support for system_message cross-references
(often to "problematic").
Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** nodes.py 7 Mar 2002 04:06:08 -0000 1.35
--- nodes.py 11 Mar 2002 03:43:26 -0000 1.36
***************
*** 581,601 ****
if node.has_key('name'):
name = node['name']
! if self.nameids.has_key(name) \
! and self.ids[self.nameids[name]].has_key('name'):
! msg = self.reporter.info(
! '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)
--- 581,602 ----
if node.has_key('name'):
name = node['name']
! #if self.nameids.has_key(name) \
! # and self.ids[self.nameids[name]].has_key('name'):
! # msg = self.reporter.info(
! # 'Multiple IDs for name "%s": "%s", "%s"'
! # % (name, self.nameids[name], id))
! # msgnode += msg
self.nameids[name] = id
+ return id
def note_implicit_target(self, targetnode, msgnode=None):
if msgnode == None:
msgnode = self.messages
+ id = self.set_id(targetnode, msgnode)
name = targetnode['name']
if self.explicit_targets.has_key(name) \
or self.implicit_targets.has_key(name):
msg = self.reporter.info(
! 'Duplicate implicit target name: "%s"' % name, refid=id)
msgnode += msg
self.clear_target_names(name, self.implicit_targets)
***************
*** 603,611 ****
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):
--- 604,612 ----
targetnode['dupname'] = name
self.implicit_targets[name] = targetnode
def note_explicit_target(self, targetnode, msgnode=None):
if msgnode == None:
msgnode = self.messages
+ id = self.set_id(targetnode, msgnode)
name = targetnode['name']
if self.explicit_targets.has_key(name):
***************
*** 618,622 ****
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,
--- 619,624 ----
level = 1 # just inform if refuri's identical
msg = self.reporter.system_message(
! level, 'Duplicate explicit target name: "%s"' % name,
! refid=id)
msgnode += msg
self.clear_target_names(name, self.explicit_targets,
***************
*** 627,635 ****
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):
--- 629,636 ----
elif self.implicit_targets.has_key(name):
msg = self.reporter.info(
! 'Duplicate implicit target name: "%s"' % name, refid=id)
msgnode += msg
self.clear_target_names(name, self.implicit_targets)
self.explicit_targets[name] = targetnode
def clear_target_names(self, name, *targetdicts):
|
