Update of /cvsroot/docstring/dps/dps
In directory usw-pr-cvs1:/tmp/cvs-serv1222/dps/dps
Modified Files:
nodes.py
Log Message:
- Reworked option lists.
Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** nodes.py 22 Feb 2002 02:11:14 -0000 1.32
--- nodes.py 1 Mar 2002 03:17:06 -0000 1.33
***************
*** 65,69 ****
except SkipSiblings:
pass
! except (SkipChildren, SkipDeparture):
pass
--- 65,69 ----
except SkipSiblings:
pass
! except (SkipChildren, SkipNode):
pass
***************
*** 91,95 ****
except SkipChildren:
pass
! except SkipDeparture:
return
name = 'depart_' + self.__class__.__name__
--- 91,95 ----
except SkipChildren:
pass
! except SkipNode:
return
name = 'depart_' + self.__class__.__name__
***************
*** 726,736 ****
class field_argument(Component, TextElement): pass
class field_body(Component, Element): pass
class option_list(Sequential, Element): pass
! class option_list_item(Component, Element): pass
! class option(Component, Element): pass
! class short_option(Component, TextElement): pass
! class long_option(Component, TextElement): pass
! class vms_option(Component, TextElement): pass
! class option_argument(Component, TextElement): pass
class description(Component, Element): pass
class literal_block(General, TextElement): pass
--- 726,756 ----
class field_argument(Component, TextElement): pass
class field_body(Component, Element): pass
+
+
+ class option(Component, Element):
+
+ child_text_separator = ''
+
+
+ class option_argument(Component, TextElement):
+
+ def astext(self):
+ return self.get('delimiter', ' ') + TextElement.astext(self)
+
+
+ class option_group(Component, Element):
+
+ child_text_separator = ', '
+
+
class option_list(Sequential, Element): pass
!
!
! class option_list_item(Component, Element):
!
! child_text_separator = ' '
!
!
! class option_string(Component, TextElement): pass
class description(Component, Element): pass
class literal_block(General, TextElement): pass
***************
*** 807,819 ****
hint
image important interpreted
! label legend list_item literal literal_block long_option
note
! option option_argument option_list option_list_item organization
paragraph problematic
reference revision row
! section short_option status strong substitution_definition
substitution_reference subtitle system_message
table target tbody term tgroup thead tip title transition
! version vms_option
warning""".split()
"""A list of names of all concrete Node subclasses."""
--- 827,840 ----
hint
image important interpreted
! label legend list_item literal literal_block
note
! option option_argument option_group option_list option_list_item
! option_string organization
paragraph problematic
reference revision row
! section status strong substitution_definition
substitution_reference subtitle system_message
table target tbody term tgroup thead tip title transition
! version
warning""".split()
"""A list of names of all concrete Node subclasses."""
***************
*** 903,905 ****
class SkipChildren(VisitorException): pass
class SkipSiblings(VisitorException): pass
! class SkipDeparture(VisitorException): pass
--- 924,926 ----
class SkipChildren(VisitorException): pass
class SkipSiblings(VisitorException): pass
! class SkipNode(VisitorException): pass
|
