New batch from Fred

6 files changed, 1195 insertions, 473 deletions

diff --git a/Doc/lib/libparser.tex b/Doc/lib/libparser.tex
index 130ae95..4398177 100644
--- a/Doc/lib/libparser.tex
+++ b/Doc/lib/libparser.tex
@@ -14,12 +14,6 @@
 \section{Built-in Module \sectcode{parser}}
 \bimodindex{parser}
 
-
-% ==== 2. ====
-% Give a short overview of what the module does.
-% If it is platform specific, mention this.
-% Mention other important restrictions or general operating principles.
-
 The \code{parser} module provides an interface to Python's internal
 parser and byte-code compiler.  The primary purpose for this interface
 is to allow Python code to edit the parse tree of a Python expression
@@ -40,24 +34,37 @@ is created from a grammar specification defined in the file
 trees stored in the ``AST objects'' created by this module are the
 actual output from the internal parser when created by the
 \code{expr()} or \code{suite()} functions, described below.  The AST
-objects created by \code{tuple2ast()} faithfully simulate those
-structures.
-
-Each element of the tuples returned by \code{ast2tuple()} has a simple
-form.  Tuples representing non-terminal elements in the grammar always
-have a length greater than one.  The first element is an integer which
-identifies a production in the grammar.  These integers are given
-symbolic names in the C header file \code{Include/graminit.h} and the
-Python module \code{Lib/symbol.py}.  Each additional element of the
-tuple represents a component of the production as recognized in the
-input string: these are always tuples which have the same form as the
-parent.  An important aspect of this structure which should be noted
-is that keywords used to identify the parent node type, such as the
-keyword \code{if} in an \emph{if\_stmt}, are included in the node tree
-without any special treatment.  For example, the \code{if} keyword is
+objects created by \code{sequence2ast()} faithfully simulate those
+structures.  Be aware that the values of the sequences which are
+considered ``correct'' will vary from one version of Python to another
+as the formal grammar for the language is revised.  However,
+transporting code from one Python version to another as source text
+will always allow correct parse trees to be created in the target
+version, with the only restriction being that migrating to an older
+version of the interpreter will not support more recent language
+constructs.  The parse trees are not typically compatible from one
+version to another, whereas source code has always been
+forward-compatible.
+
+Each element of the sequences returned by \code{ast2list} or
+\code{ast2tuple()} has a simple form.  Sequences representing
+non-terminal elements in the grammar always have a length greater than
+one.  The first element is an integer which identifies a production in
+the grammar.  These integers are given symbolic names in the C header
+file \code{Include/graminit.h} and the Python module
+\code{Lib/symbol.py}.  Each additional element of the sequence represents
+a component of the production as recognized in the input string: these
+are always sequences which have the same form as the parent.  An
+important aspect of this structure which should be noted is that
+keywords used to identify the parent node type, such as the keyword
+\code{if} in an \emph{if\_stmt}, are included in the node tree without
+any special treatment.  For example, the \code{if} keyword is
 represented by the tuple \code{(1, 'if')}, where \code{1} is the
 numeric value associated with all \code{NAME} elements, including
-variable and function names defined by the user.
+variable and function names defined by the user.  In an alternate form
+returned when line number information is requested, the same token
+might be represented as \code{(1, 'if', 12)}, where the \code{12}
+represents the line number at which the terminal symbol was found.
 
 Terminal elements are represented in much the same way, but without
 any child elements and the addition of the source text which was
@@ -70,27 +77,47 @@ The AST objects are not actually required to support the functionality
 of this module, but are provided for three purposes: to allow an
 application to amortize the cost of processing complex parse trees, to
 provide a parse tree representation which conserves memory space when
-compared to the Python tuple representation, and to ease the creation
-of additional modules in C which manipulate parse trees.  A simple
-``wrapper'' module may be created in Python to hide the use of AST
-objects.
+compared to the Python list or tuple representation, and to ease the
+creation of additional modules in C which manipulate parse trees.  A
+simple ``wrapper'' module may be created in Python to hide the use of
+AST objects.
 
 
 The \code{parser} module defines the following functions:
 
 \renewcommand{\indexsubitem}{(in module parser)}
 
-\begin{funcdesc}{ast2tuple}{ast}
+\begin{funcdesc}{ast2list}{ast\optional{\, line\_info\code{ = 0}}}
 This function accepts an AST object from the caller in
-\code{\var{ast}} and returns a Python tuple representing the
-equivelent parse tree.  The resulting tuple representation can be used
-for inspection or the creation of a new parse tree in tuple form.
+\code{\var{ast}} and returns a Python list representing the
+equivelent parse tree.  The resulting list representation can be used
+for inspection or the creation of a new parse tree in list form.
 This function does not fail so long as memory is available to build
-the tuple representation.
+the list representation.  If a parse tree will only be used for
+inspection, \code{ast2tuple()} should be used instead to reduce memory
+consumption and fragmentation.  When modifications are to be made to
+the parse tree, this function is significantly faster than retrieving
+a tuple representation and converting that to nested lists.
+
+If the \code{line\_info} flag is given true value, line number
+information will be included for all terminal tokens as a third
+element of the list representing the token.  This information is
+omitted if the flag is false or omitted.
 \end{funcdesc}
 
+\begin{funcdesc}{ast2tuple}{ast\optional{\, line\_info\code{ = 0}}}
+This function accepts an AST object from the caller in
+\code{\var{ast}} and returns a Python tuple representing the
+equivelent parse tree.  Other than returning a tuple instead of a
+list, this function is identical to \code{ast2list()}.
+
+If the \code{line\_info} flag is given true value, line number
+information will be included for all terminal tokens as a third
+element of the list representing the token.  This information is
+omitted if the flag is false or omitted.
+\end{funcdesc}
 
-\begin{funcdesc}{compileast}{ast\optional{\, filename \code{= '<ast>'}}}
+\begin{funcdesc}{compileast}{ast\optional{\, filename\code{ = '<ast>'}}}
 The Python byte compiler can be invoked on an AST object to produce
 code objects which can be used as part of an \code{exec} statement or
 a call to the built-in \code{eval()} function.  This function provides
@@ -98,6 +125,16 @@ the interface to the compiler, passing the internal parse tree from
 \code{\var{ast}} to the parser, using the source file name specified
 by the \code{\var{filename}} parameter.  The default value supplied
 for \code{\var{filename}} indicates that the source was an AST object.
+
+Compiling an AST object may result in exceptions related to
+compilation; an example would be a \code{SyntaxError} caused by the
+parse tree for \code{del f(0)}; this statement is considered legal
+within the formal grammar for Python but is not a legal language
+construct.  The \code{SyntaxError} raised for this condition is
+actually generated by the Python byte-compiler normally, which is why
+it can be raised at this point by the \code{parser} module.  Most
+causes of compilation failure can be diagnosed programmatically by
+inspection of the parse tree.
 \end{funcdesc}
 
 
@@ -138,19 +175,33 @@ thrown.
 \end{funcdesc}
 
 
-\begin{funcdesc}{tuple2ast}{tuple}
-This function accepts a parse tree represented as a tuple and builds
-an internal representation if possible.  If it can validate that the
-tree conforms to the Python syntax and all nodes are valid node types
-in the host version of Python, an AST object is created from the
-internal representation and returned to the called.  If there is a
-problem creating the internal representation, or if the tree cannot be
-validated, a \code{ParserError} exception is thrown.  An AST object
-created this way should not be assumed to compile correctly; normal
-exceptions thrown by compilation may still be initiated when the AST
-object is passed to \code{compileast()}.  This will normally indicate
-problems not related to syntax (such as a \code{MemoryError}
-exception).
+\begin{funcdesc}{sequence2ast}{sequence}
+This function accepts a parse tree represented as a sequence and
+builds an internal representation if possible.  If it can validate
+that the tree conforms to the Python grammar and all nodes are valid
+node types in the host version of Python, an AST object is created
+from the internal representation and returned to the called.  If there
+is a problem creating the internal representation, or if the tree
+cannot be validated, a \code{ParserError} exception is thrown.  An AST
+object created this way should not be assumed to compile correctly;
+normal exceptions thrown by compilation may still be initiated when
+the AST object is passed to \code{compileast()}.  This will normally
+indicate problems not related to syntax (such as a \code{MemoryError}
+exception), but may also be due to constructs such as the result of
+parsing \code{del f(0)}, which escapes the Python parser but is
+checked by the bytecode compiler.
+
+Sequences representing terminal tokens may be represented as either
+two-element lists of the form \code{(1, 'name')} or as three-element
+lists of the form \code{(1, 'name', 56)}.  If the third element is
+present, it is assumed to be a valid line number.  The line number
+may be specified for any subset of the terminal symbols in the input
+tree.
+\end{funcdesc}
+
+\begin{funcdesc}{tuple2ast}{sequence}
+This is the same function as \code{sequence2ast}.  This entry point is
+maintained for backward compatibility.
 \end{funcdesc}
 
 
@@ -166,9 +217,9 @@ Exception raised when a failure occurs within the parser module.  This
 is generally produced for validation failures rather than the built in
 \code{SyntaxError} thrown during normal parsing.
 The exception argument is either a string describing the reason of the
-failure or a tuple containing a tuple causing the failure from a parse
-tree passed to \code{tuple2ast()} and an explanatory string.  Calls to
-\code{tuple2ast()} need to be able to handle either type of exception,
+failure or a tuple containing a sequence causing the failure from a parse
+tree passed to \code{sequence2ast()} and an explanatory string.  Calls to
+\code{sequence2ast()} need to be able to handle either type of exception,
 while calls to other functions in the module will only need to be
 aware of the simple string values.
 \end{excdesc}
@@ -182,9 +233,36 @@ exceptions carry all the meaning normally associated with them.  Refer
 to the descriptions of each function for detailed information.
 
 
+\subsection{AST Objects}
+
+AST objects (returned by \code{expr()}, \code{suite()}, and
+\code{tuple2ast()}, described above) have no methods of their own.
+Some of the functions defined which accept an AST object as their
+first argument may change to object methods in the future.
+
+Ordered and equality comparisons are supported between AST objects.
+
+
 \subsection{Example}
 
-A simple example:
+The parser modules allows operations to be performed on the parse tree
+of Python source code before the bytecode is generated, and provides
+for inspection of the parse tree for information gathering purposes as
+well.  While many useful operations may take place between parsing and
+bytecode generation, the simplest operation is to do nothing.  For
+this purpose, using the \code{parser} module to produce an
+intermediate data structure is equivelent to the code
+
+\begin{verbatim}
+>>> code = compile('a + 5', 'eval')
+>>> a = 5
+>>> eval(code)
+10
+\end{verbatim}
+
+The equivelent operation using the \code{parser} module is somewhat
+longer, and allows the intermediate internal parse tree to be retained
+as an AST object:
 
 \begin{verbatim}
 >>> import parser
@@ -195,18 +273,187 @@ A simple example:
 10
 \end{verbatim}
 
+Some applications can benfit from access to the parse tree itself, and
+can take advantage of the intermediate data structure provided by the
+\code{parser} module.  The remainder of this section of examples will
+demonstrate how the intermediate data structure can provide access to
+module documentation defined in docstrings without requiring that the
+code being examined be imported into a running interpreter.  This can
+be very useful for performing analyses of untrusted code.
+
+Generally, the example will demonstrate how the parse tree may be
+traversed to distill interesting information.  Two functions and a set
+of classes is developed which provide programmatic access to high
+level function and class definitions provided by a module.  The
+classes extract information from the parse tree and provide access to
+the information at a useful semantic level, one function provides a
+simple low-level pattern matching capability, and the other function
+defines a high-level interface to the classes by handling file
+operations on behalf of the caller.  All source files mentioned here
+which are not part of the Python installation are located in the
+\file{Demo/parser} directory of the distribution.
+
+To construct the upper-level extraction methods, we need to know what
+the parse tree structure looks like and how much of it we actually
+need to be concerned about.  Python uses a moderately deep parse tree,
+so there are a large number of intermediate nodes.  It is important to
+read and understand the formal grammar used by Python.  This is
+specified in the file \file{Grammar/Grammar} in the distribution.
+Consider the simplest case of interest when searching for docstrings:
+a module consisting of a docstring and nothing else:
 
-\subsection{AST Objects}
+\begin{verbatim}
+"""Some documentation.
+"""
+\end{verbatim}
 
-AST objects (returned by \code{expr()}, \code{suite()}, and
-\code{tuple2ast()}, described above) have no methods of their own.
-Some of the functions defined which accept an AST object as their
-first argument may change to object methods in the future.
+Using the interpreter to take a look at the parse tree, we find a
+bewildering mass of numbers and parentheses, with the documentation
+buried deep in the nested tuples:
 
-Ordered and equality comparisons are supported between AST objects.
+\begin{verbatim}
+>>> import parser
+>>> import pprint
+>>> ast = parser.suite(open('docstring.py').read())
+>>> tup = parser.ast2tuple(ast)
+>>> pprint.pprint(tup)
+(257,
+ (264,
+  (265,
+   (266,
+    (267,
+     (307,
+      (287,
+       (288,
+        (289,
+         (290,
+          (292,
+           (293,
+            (294,
+             (295,
+              (296,
+               (297,
+                (298,
+                 (299,
+                  (300, (3, '"""Some documentation.\012"""'))))))))))))))))),
+   (4, ''))),
+ (4, ''),
+ (0, ''))
+\end{verbatim}
+
+The numbers at the first element of each node in the tree are the node
+types; they map directly to terminal and non-terminal symbols in the
+grammar.  Unfortunately, they are represented as integers in the
+internal representation, and the Python structures generated do not
+change that.  However, the \code{symbol} and \code{token} modules
+provide symbolic names for the node types and dictionaries which map
+from the integers to the symbolic names for the node types.
+
+In the output presented above, the outermost tuple contains four
+elements: the integer \code{257} and three additional tuples.  Node
+type \code{257} has the symbolic name \code{file_input}.  Each of
+these inner tuples contains an integer as the first element; these
+integers, \code{264}, \code{4}, and \code{0}, represent the node types
+\code{stmt}, \code{NEWLINE}, and \code{ENDMARKER}, respectively.
+Note that these values may change depending on the version of Python
+you are using; consult \file{symbol.py} and \file{token.py} for
+details of the mapping.  It should be fairly clear that the outermost
+node is related primarily to the input source rather than the contents
+of the file, and may be disregarded for the moment.  The \code{stmt}
+node is much more interesting.  In particular, all docstrings are
+found in subtrees which are formed exactly as this node is formed,
+with the only difference being the string itself.  The association
+between the docstring in a similar tree and the defined entity (class,
+function, or module) which it describes is given by the position of
+the docstring subtree within the tree defining the described
+structure.
+
+By replacing the actual docstring with something to signify a variable
+component of the tree, we allow a simple pattern matching approach may
+be taken to checking any given subtree for equivelence to the general
+pattern for docstrings.  Since the example demonstrates information
+extraction, we can safely require that the tree be in tuple form
+rather than list form, allowing a simple variable representation to be
+\code{['variable\_name']}.  A simple recursive function can implement
+the pattern matching, returning a boolean and a dictionary of variable
+name to value mappings.
+
+\begin{verbatim}
+from types import ListType, TupleType
+
+def match(pattern, data, vars=None):
+    if vars is None:
+        vars = {}
+    if type(pattern) is ListType:
+        vars[pattern[0]] = data
+        return 1, vars
+    if type(pattern) is not TupleType:
+        return (pattern == data), vars
+    if len(data) != len(pattern):
+        return 0, vars
+    for pattern, data in map(None, pattern, data):
+        same, vars = match(pattern, data, vars)
+        if not same:
+            break
+    return same, vars
+\end{verbatim}
+
+Using this simple recursive pattern matching function and the symbolic
+node types, the pattern for the candidate docstring subtrees becomes:
 
-\renewcommand{\indexsubitem}{(ast method)}
+\begin{verbatim}
+>>> DOCSTRING_STMT_PATTERN = (
+...     symbol.stmt,
+...     (symbol.simple_stmt,
+...      (symbol.small_stmt,
+...       (symbol.expr_stmt,
+...        (symbol.testlist,
+...         (symbol.test,
+...          (symbol.and_test,
+...           (symbol.not_test,
+...            (symbol.comparison,
+...             (symbol.expr,
+...              (symbol.xor_expr,
+...               (symbol.and_expr,
+...                (symbol.shift_expr,
+...                 (symbol.arith_expr,
+...                  (symbol.term,
+...                   (symbol.factor,
+...                    (symbol.power,
+...                     (symbol.atom,
+...                      (token.STRING, ['docstring'])
+...                      )))))))))))))))),
+...      (token.NEWLINE, '')
+...      ))
+\end{verbatim}
+
+Using the \code{match()} function with this pattern, extracting the
+module docstring from the parse tree created previously is easy:
+
+\begin{verbatim}
+>>> found, vars = match(DOCSTRING_STMT_PATTERN, tup[1])
+>>> found
+1
+>>> vars
+{'docstring': '"""Some documentation.\012"""'}
+\end{verbatim}
 
-%\begin{funcdesc}{empty}{}
-%Empty the can into the trash.
-%\end{funcdesc}
+Once specific data can be extracted from a location where it is
+expected, the question of where information can be expected
+needs to be answered.  When dealing with docstrings, the answer is
+fairly simple: the docstring is the first \code{stmt} node in a code
+block (\code{file_input} or \code{suite} node types).  A module
+consists of a single \code{file_input} node, and class and function
+definitions each contain exactly one \code{suite} node.  Classes and
+functions are readily identified as subtrees of code block nodes which
+start with \code{(stmt, (compound_stmt, (classdef, ...} or
+\code{(stmt, (compound_stmt, (funcdef, ...}.  Note that these subtrees
+cannot be matched by \code{match()} since it does not support multiple
+sibling nodes to match without regard to number.  A more elaborate
+matching function could be used to overcome this limitation, but this
+is sufficient for the example.
+
+
+
+%%
+%%  end of file
diff --git a/Doc/libparser.tex b/Doc/libparser.tex
index 130ae95..4398177 100644
--- a/Doc/libparser.tex
+++ b/Doc/libparser.tex
@@ -14,12 +14,6 @@
 \section{Built-in Module \sectcode{parser}}
 \bimodindex{parser}
 
-
-% ==== 2. ====
-% Give a short overview of what the module does.
-% If it is platform specific, mention this.
-% Mention other important restrictions or general operating principles.
-
 The \code{parser} module provides an interface to Python's internal
 parser and byte-code compiler.  The primary purpose for this interface
 is to allow Python code to edit the parse tree of a Python expression
@@ -40,24 +34,37 @@ is created from a grammar specification defined in the file
 trees stored in the ``AST objects'' created by this module are the
 actual output from the internal parser when created by the
 \code{expr()} or \code{suite()} functions, described below.  The AST
-objects created by \code{tuple2ast()} faithfully simulate those
-structures.
-
-Each element of the tuples returned by \code{ast2tuple()} has a simple
-form.  Tuples representing non-terminal elements in the grammar always
-have a length greater than one.  The first element is an integer which
-identifies a production in the grammar.  These integers are given
-symbolic names in the C header file \code{Include/graminit.h} and the
-Python module \code{Lib/symbol.py}.  Each additional element of the
-tuple represents a component of the production as recognized in the
-input string: these are always tuples which have the same form as the
-parent.  An important aspect of this structure which should be noted
-is that keywords used to identify the parent node type, such as the
-keyword \code{if} in an \emph{if\_stmt}, are included in the node tree
-without any special treatment.  For example, the \code{if} keyword is
+objects created by \code{sequence2ast()} faithfully simulate those
+structures.  Be aware that the values of the sequences which are
+considered ``correct'' will vary from one version of Python to another
+as the formal grammar for the language is revised.  However,
+transporting code from one Python version to another as source text
+will always allow correct parse trees to be created in the target
+version, with the only restriction being that migrating to an older
+version of the interpreter will not support more recent language
+constructs.  The parse trees are not typically compatible from one
+version to another, whereas source code has always been
+forward-compatible.
+
+Each element of the sequences returned by \code{ast2list} or
+\code{ast2tuple()} has a simple form.  Sequences representing
+non-terminal elements in the grammar always have a length greater than
+one.  The first element is an integer which identifies a production in
+the grammar.  These integers are given symbolic names in the C header
+file \code{Include/graminit.h} and the Python module
+\code{Lib/symbol.py}.  Each additional element of the sequence represents
+a component of the production as recognized in the input string: these
+are always sequences which have the same form as the parent.  An
+important aspect of this structure which should be noted is that
+keywords used to identify the parent node type, such as the keyword
+\code{if} in an \emph{if\_stmt}, are included in the node tree without
+any special treatment.  For example, the \code{if} keyword is
 represented by the tuple \code{(1, 'if')}, where \code{1} is the
 numeric value associated with all \code{NAME} elements, including
-variable and function names defined by the user.
+variable and function names defined by the user.  In an alternate form
+returned when line number information is requested, the same token
+might be represented as \code{(1, 'if', 12)}, where the \code{12}
+represents the line number at which the terminal symbol was found.
 
 Terminal elements are represented in much the same way, but without
 any child elements and the addition of the source text which was
@@ -70,27 +77,47 @@ The AST objects are not actually required to support the functionality
 of this module, but are provided for three purposes: to allow an
 application to amortize the cost of processing complex parse trees, to
 provide a parse tree representation which conserves memory space when
-compared to the Python tuple representation, and to ease the creation
-of additional modules in C which manipulate parse trees.  A simple
-``wrapper'' module may be created in Python to hide the use of AST
-objects.
+compared to the Python list or tuple representation, and to ease the
+creation of additional modules in C which manipulate parse trees.  A
+simple ``wrapper'' module may be created in Python to hide the use of
+AST objects.
 
 
 The \code{parser} module defines the following functions:
 
 \renewcommand{\indexsubitem}{(in module parser)}
 
-\begin{funcdesc}{ast2tuple}{ast}
+\begin{funcdesc}{ast2list}{ast\optional{\, line\_info\code{ = 0}}}
 This function accepts an AST object from the caller in
-\code{\var{ast}} and returns a Python tuple representing the
-equivelent parse tree.  The resulting tuple representation can be used
-for inspection or the creation of a new parse tree in tuple form.
+\code{\var{ast}} and returns a Python list representing the
+equivelent parse tree.  The resulting list representation can be used
+for inspection or the creation of a new parse tree in list form.
 This function does not fail so long as memory is available to build
-the tuple representation.
+the list representation.  If a parse tree will only be used for
+inspection, \code{ast2tuple()} should be used instead to reduce memory
+consumption and fragmentation.  When modifications are to be made to
+the parse tree, this function is significantly faster than retrieving
+a tuple representation and converting that to nested lists.
+
+If the \code{line\_info} flag is given true value, line number
+information will be included for all terminal tokens as a third
+element of the list representing the token.  This information is
+omitted if the flag is false or omitted.
 \end{funcdesc}
 
+\begin{funcdesc}{ast2tuple}{ast\optional{\, line\_info\code{ = 0}}}
+This function accepts an AST object from the caller in
+\code{\var{ast}} and returns a Python tuple representing the
+equivelent parse tree.  Other than returning a tuple instead of a
+list, this function is identical to \code{ast2list()}.
+
+If the \code{line\_info} flag is given true value, line number
+information will be included for all terminal tokens as a third
+element of the list representing the token.  This information is
+omitted if the flag is false or omitted.
+\end{funcdesc}
 
-\begin{funcdesc}{compileast}{ast\optional{\, filename \code{= '<ast>'}}}
+\begin{funcdesc}{compileast}{ast\optional{\, filename\code{ = '<ast>'}}}
 The Python byte compiler can be invoked on an AST object to produce
 code objects which can be used as part of an \code{exec} statement or
 a call to the built-in \code{eval()} function.  This function provides
@@ -98,6 +125,16 @@ the interface to the compiler, passing the internal parse tree from
 \code{\var{ast}} to the parser, using the source file name specified
 by the \code{\var{filename}} parameter.  The default value supplied
 for \code{\var{filename}} indicates that the source was an AST object.
+
+Compiling an AST object may result in exceptions related to
+compilation; an example would be a \code{SyntaxError} caused by the
+parse tree for \code{del f(0)}; this statement is considered legal
+within the formal grammar for Python but is not a legal language
+construct.  The \code{SyntaxError} raised for this condition is
+actually generated by the Python byte-compiler normally, which is why
+it can be raised at this point by the \code{parser} module.  Most
+causes of compilation failure can be diagnosed programmatically by
+inspection of the parse tree.
 \end{funcdesc}
 
 
@@ -138,19 +175,33 @@ thrown.
 \end{funcdesc}
 
 
-\begin{funcdesc}{tuple2ast}{tuple}
-This function accepts a parse tree represented as a tuple and builds
-an internal representation if possible.  If it can validate that the
-tree conforms to the Python syntax and all nodes are valid node types
-in the host version of Python, an AST object is created from the
-internal representation and returned to the called.  If there is a
-problem creating the internal representation, or if the tree cannot be
-validated, a \code{ParserError} exception is thrown.  An AST object
-created this way should not be assumed to compile correctly; normal
-exceptions thrown by compilation may still be initiated when the AST
-object is passed to \code{compileast()}.  This will normally indicate
-problems not related to syntax (such as a \code{MemoryError}
-exception).
+\begin{funcdesc}{sequence2ast}{sequence}
+This function accepts a parse tree represented as a sequence and
+builds an internal representation if possible.  If it can validate
+that the tree conforms to the Python grammar and all nodes are valid
+node types in the host version of Python, an AST object is created
+from the internal representation and returned to the called.  If there
+is a problem creating the internal representation, or if the tree
+cannot be validated, a \code{ParserError} exception is thrown.  An AST
+object created this way should not be assumed to compile correctly;
+normal exceptions thrown by compilation may still be initiated when
+the AST object is passed to \code{compileast()}.  This will normally
+indicate problems not related to syntax (such as a \code{MemoryError}
+exception), but may also be due to constructs such as the result of
+parsing \code{del f(0)}, which escapes the Python parser but is
+checked by the bytecode compiler.
+
+Sequences representing terminal tokens may be represented as either
+two-element lists of the form \code{(1, 'name')} or as three-element
+lists of the form \code{(1, 'name', 56)}.  If the third element is
+present, it is assumed to be a valid line number.  The line number
+may be specified for any subset of the terminal symbols in the input
+tree.
+\end{funcdesc}
+
+\begin{funcdesc}{tuple2ast}{sequence}
+This is the same function as \code{sequence2ast}.  This entry point is
+maintained for backward compatibility.
 \end{funcdesc}
 
 
@@ -166,9 +217,9 @@ Exception raised when a failure occurs within the parser module.  This
 is generally produced for validation failures rather than the built in
 \code{SyntaxError} thrown during normal parsing.
 The exception argument is either a string describing the reason of the
-failure or a tuple containing a tuple causing the failure from a parse
-tree passed to \code{tuple2ast()} and an explanatory string.  Calls to
-\code{tuple2ast()} need to be able to handle either type of exception,
+failure or a tuple containing a sequence causing the failure from a parse
+tree passed to \code{sequence2ast()} and an explanatory string.  Calls to
+\code{sequence2ast()} need to be able to handle either type of exception,
 while calls to other functions in the module will only need to be
 aware of the simple string values.
 \end{excdesc}
@@ -182,9 +233,36 @@ exceptions carry all the meaning normally associated with them.  Refer
 to the descriptions of each function for detailed information.
 
 
+\subsection{AST Objects}
+
+AST objects (returned by \code{expr()}, \code{suite()}, and
+\code{tuple2ast()}, described above) have no methods of their own.
+Some of the functions defined which accept an AST object as their
+first argument may change to object methods in the future.
+
+Ordered and equality comparisons are supported between AST objects.
+
+
 \subsection{Example}
 
-A simple example:
+The parser modules allows operations to be performed on the parse tree
+of Python source code before the bytecode is generated, and provides
+for inspection of the parse tree for information gathering purposes as
+well.  While many useful operations may take place between parsing and
+bytecode generation, the simplest operation is to do nothing.  For
+this purpose, using the \code{parser} module to produce an
+intermediate data structure is equivelent to the code
+
+\begin{verbatim}
+>>> code = compile('a + 5', 'eval')
+>>> a = 5
+>>> eval(code)
+10
+\end{verbatim}
+
+The equivelent operation using the \code{parser} module is somewhat
+longer, and allows the intermediate internal parse tree to be retained
+as an AST object:
 
 \begin{verbatim}
 >>> import parser
@@ -195,18 +273,187 @@ A simple example:
 10
 \end{verbatim}
 
+Some applications can benfit from access to the parse tree itself, and
+can take advantage of the intermediate data structure provided by the
+\code{parser} module.  The remainder of this section of examples will
+demonstrate how the intermediate data structure can provide access to
+module documentation defined in docstrings without requiring that the
+code being examined be imported into a running interpreter.  This can
+be very useful for performing analyses of untrusted code.
+
+Generally, the example will demonstrate how the parse tree may be
+traversed to distill interesting information.  Two functions and a set
+of classes is developed which provide programmatic access to high
+level function and class definitions provided by a module.  The
+classes extract information from the parse tree and provide access to
+the information at a useful semantic level, one function provides a
+simple low-level pattern matching capability, and the other function
+defines a high-level interface to the classes by handling file
+operations on behalf of the caller.  All source files mentioned here
+which are not part of the Python installation are located in the
+\file{Demo/parser} directory of the distribution.
+
+To construct the upper-level extraction methods, we need to know what
+the parse tree structure looks like and how much of it we actually
+need to be concerned about.  Python uses a moderately deep parse tree,
+so there are a large number of intermediate nodes.  It is important to
+read and understand the formal grammar used by Python.  This is
+specified in the file \file{Grammar/Grammar} in the distribution.
+Consider the simplest case of interest when searching for docstrings:
+a module consisting of a docstring and nothing else:
 
-\subsection{AST Objects}
+\begin{verbatim}
+"""Some documentation.
+"""
+\end{verbatim}
 
-AST objects (returned by \code{expr()}, \code{suite()}, and
-\code{tuple2ast()}, described above) have no methods of their own.
-Some of the functions defined which accept an AST object as their
-first argument may change to object methods in the future.
+Using the interpreter to take a look at the parse tree, we find a
+bewildering mass of numbers and parentheses, with the documentation
+buried deep in the nested tuples:
 
-Ordered and equality comparisons are supported between AST objects.
+\begin{verbatim}
+>>> import parser
+>>> import pprint
+>>> ast = parser.suite(open('docstring.py').read())
+>>> tup = parser.ast2tuple(ast)
+>>> pprint.pprint(tup)
+(257,
+ (264,
+  (265,
+   (266,
+    (267,
+     (307,
+      (287,
+       (288,
+        (289,
+         (290,
+          (292,
+           (293,
+            (294,
+             (295,
+              (296,
+               (297,
+                (298,
+                 (299,
+                  (300, (3, '"""Some documentation.\012"""'))))))))))))))))),
+   (4, ''))),
+ (4, ''),
+ (0, ''))
+\end{verbatim}
+
+The numbers at the first element of each node in the tree are the node
+types; they map directly to terminal and non-terminal symbols in the
+grammar.  Unfortunately, they are represented as integers in the
+internal representation, and the Python structures generated do not
+change that.  However, the \code{symbol} and \code{token} modules
+provide symbolic names for the node types and dictionaries which map
+from the integers to the symbolic names for the node types.
+
+In the output presented above, the outermost tuple contains four
+elements: the integer \code{257} and three additional tuples.  Node
+type \code{257} has the symbolic name \code{file_input}.  Each of
+these inner tuples contains an integer as the first element; these
+integers, \code{264}, \code{4}, and \code{0}, represent the node types
+\code{stmt}, \code{NEWLINE}, and \code{ENDMARKER}, respectively.
+Note that these values may change depending on the version of Python
+you are using; consult \file{symbol.py} and \file{token.py} for
+details of the mapping.  It should be fairly clear that the outermost
+node is related primarily to the input source rather than the contents
+of the file, and may be disregarded for the moment.  The \code{stmt}
+node is much more interesting.  In particular, all docstrings are
+found in subtrees which are formed exactly as this node is formed,
+with the only difference being the string itself.  The association
+between the docstring in a similar tree and the defined entity (class,
+function, or module) which it describes is given by the position of
+the docstring subtree within the tree defining the described
+structure.
+
+By replacing the actual docstring with something to signify a variable
+component of the tree, we allow a simple pattern matching approach may
+be taken to checking any given subtree for equivelence to the general
+pattern for docstrings.  Since the example demonstrates information
+extraction, we can safely require that the tree be in tuple form
+rather than list form, allowing a simple variable representation to be
+\code{['variable\_name']}.  A simple recursive function can implement
+the pattern matching, returning a boolean and a dictionary of variable
+name to value mappings.
+
+\begin{verbatim}
+from types import ListType, TupleType
+
+def match(pattern, data, vars=None):
+    if vars is None:
+        vars = {}
+    if type(pattern) is ListType:
+        vars[pattern[0]] = data
+        return 1, vars
+    if type(pattern) is not TupleType:
+        return (pattern == data), vars
+    if len(data) != len(pattern):
+        return 0, vars
+    for pattern, data in map(None, pattern, data):
+        same, vars = match(pattern, data, vars)
+        if not same:
+            break
+    return same, vars
+\end{verbatim}
+
+Using this simple recursive pattern matching function and the symbolic
+node types, the pattern for the candidate docstring subtrees becomes:
 
-\renewcommand{\indexsubitem}{(ast method)}
+\begin{verbatim}
+>>> DOCSTRING_STMT_PATTERN = (
+...     symbol.stmt,
+...     (symbol.simple_stmt,
+...      (symbol.small_stmt,
+...       (symbol.expr_stmt,
+...        (symbol.testlist,
+...         (symbol.test,
+...          (symbol.and_test,
+...           (symbol.not_test,
+...            (symbol.comparison,
+...             (symbol.expr,
+...              (symbol.xor_expr,
+...               (symbol.and_expr,
+...                (symbol.shift_expr,
+...                 (symbol.arith_expr,
+...                  (symbol.term,
+...                   (symbol.factor,
+...                    (symbol.power,
+...                     (symbol.atom,
+...                      (token.STRING, ['docstring'])
+...                      )))))))))))))))),
+...      (token.NEWLINE, '')
+...      ))
+\end{verbatim}
+
+Using the \code{match()} function with this pattern, extracting the
+module docstring from the parse tree created previously is easy:
+
+\begin{verbatim}
+>>> found, vars = match(DOCSTRING_STMT_PATTERN, tup[1])
+>>> found
+1
+>>> vars
+{'docstring': '"""Some documentation.\012"""'}
+\end{verbatim}
 
-%\begin{funcdesc}{empty}{}
-%Empty the can into the trash.
-%\end{funcdesc}
+Once specific data can be extracted from a location where it is
+expected, the question of where information can be expected
+needs to be answered.  When dealing with docstrings, the answer is
+fairly simple: the docstring is the first \code{stmt} node in a code
+block (\code{file_input} or \code{suite} node types).  A module
+consists of a single \code{file_input} node, and class and function
+definitions each contain exactly one \code{suite} node.  Classes and
+functions are readily identified as subtrees of code block nodes which
+start with \code{(stmt, (compound_stmt, (classdef, ...} or
+\code{(stmt, (compound_stmt, (funcdef, ...}.  Note that these subtrees
+cannot be matched by \code{match()} since it does not support multiple
+sibling nodes to match without regard to number.  A more elaborate
+matching function could be used to overcome this limitation, but this
+is sufficient for the example.
+
+
+
+%%
+%%  end of file
diff --git a/Lib/AST.py b/Lib/AST.py
index 6f92bee..370cfe4 100644
--- a/Lib/AST.py
+++ b/Lib/AST.py
@@ -1,13 +1,13 @@
 """Object-oriented interface to the parser module.
 
-This module exports three classes which together provide an interface
+This module exports four classes which together provide an interface
 to the parser module.  Together, the three classes represent two ways
 to create parsed representations of Python source and the two starting
 data types (source text and tuple representations).  Each class
 provides interfaces which are identical other than the constructors.
 The constructors are described in detail in the documentation for each
 class and the remaining, shared portion of the interface is documented
-below.  Briefly, the three classes provided are:
+below.  Briefly, the classes provided are:
 
 AST
     Defines the primary interface to the AST objects and supports creation
@@ -23,6 +23,9 @@ FileSuiteAST
     Convenience subclass of the `SuiteAST' class; loads source text of the
     suite from an external file.
 
+Common Methods
+--------------
+
 Aside from the constructors, several methods are provided to allow
 access to the various interpretations of the parse tree and to check
 conditions of the construct represented by the parse tree.
@@ -68,8 +71,8 @@ class AST:
     This base class provides all of the query methods for subclass
     objects defined in this module.
     """
-    _p = __import__('parser')		# import internally to avoid
-					# namespace pollution at the
+    import parser			# import internally to avoid
+    _p = parser				# namespace pollution at the
 					# top level
     _text = None
     _code = None
@@ -84,7 +87,8 @@ class AST:
 	    The tuple tree to convert.
 
 	The tuple-tree may represent either an expression or a suite; the
-	type will be determined automatically.
+	type will be determined automatically.  Line number information may
+	optionally be present for any subset of the terminal tokens.
 	"""
 	if type(tuple) is not type(()):
 	    raise TypeError, 'Base AST class requires tuple parameter.'
@@ -93,11 +97,24 @@ class AST:
 	self._ast  = self._p.tuple2ast(tuple)
 	self._type = (self._p.isexpr(self._ast) and 'expression') or 'suite'
 
-    def tuple(self):
+    def list(self, line_info = 0):
+	"""Returns a fresh list representing the parse tree.
+
+	line_info
+	    If true, includes line number information for terminal tokens in
+	    the output data structure,
+	"""
+	return self._p.ast2list(self._ast, line_info)
+
+    def tuple(self, line_info = 0):
 	"""Returns the tuple representing the parse tree.
+
+	line_info
+	    If true, includes line number information for terminal tokens in
+	    the output data structure,
 	"""
 	if self._tupl is None:
-	    self._tupl = self._p.ast2tuple(self._ast)
+	    self._tupl = self._p.ast2tuple(self._ast, line_info)
 	return self._tupl
 
     def code(self):
diff --git a/Lib/symbol.py b/Lib/symbol.py
index 36f178a..6d925ea 100755
--- a/Lib/symbol.py
+++ b/Lib/symbol.py
@@ -1,5 +1,18 @@
-# Non-terminal symbols of Python grammar (from "graminit.h")
+#! /usr/bin/env python
+#
+#  Non-terminal symbols of Python grammar (from "graminit.h")
+#
+#  This file is automatically generated; please don't muck it up!
+#
+#  To update the symbols in this file, 'cd' to the top directory of
+#  the python source tree after building the interpreter and run:
+#
+#    PYTHONPATH=Lib:Modules ./python Lib/symbol.py
+#
+#  (this path allows the import of string.py, token.py, and regexmodule.so
+#  for a site with no installation in place)
 
+#--start constants--
 single_input = 256
 file_input = 257
 eval_input = 258
@@ -23,39 +36,40 @@ raise_stmt = 275
 import_stmt = 276
 dotted_name = 277
 global_stmt = 278
-access_stmt = 279
-accesstype = 280
-exec_stmt = 281
-compound_stmt = 282
-if_stmt = 283
-while_stmt = 284
-for_stmt = 285
-try_stmt = 286
-except_clause = 287
-suite = 288
-test = 289
-and_test = 290
-not_test = 291
-comparison = 292
-comp_op = 293
-expr = 294
-xor_expr = 295
-and_expr = 296
-shift_expr = 297
-arith_expr = 298
-term = 299
-factor = 300
-power = 301
-atom = 302
-lambdef = 303
-trailer = 304
-subscript = 305
+exec_stmt = 279
+compound_stmt = 280
+if_stmt = 281
+while_stmt = 282
+for_stmt = 283
+try_stmt = 284
+except_clause = 285
+suite = 286
+test = 287
+and_test = 288
+not_test = 289
+comparison = 290
+comp_op = 291
+expr = 292
+xor_expr = 293
+and_expr = 294
+shift_expr = 295
+arith_expr = 296
+term = 297
+factor = 298
+power = 299
+atom = 300
+lambdef = 301
+trailer = 302
+subscriptlist = 303
+subscript = 304
+sliceop = 305
 exprlist = 306
 testlist = 307
 dictmaker = 308
 classdef = 309
 arglist = 310
 argument = 311
+#--end constants--
 
 names = dir()
 sym_name = {}
@@ -63,3 +77,17 @@ for name in names:
     number = eval(name)
     if type(number) is type(0):
 	sym_name[number] = name
+
+
+def main():
+    import sys
+    import token
+    if len(sys.argv) == 1:
+	sys.argv = sys.argv + ["Include/graminit.h", "Lib/symbol.py"]
+    token.main()
+
+if __name__ == "__main__":
+    main()
+
+#
+#  end of file
diff --git a/Lib/token.py b/Lib/token.py
index 527df70..61228e5 100755
--- a/Lib/token.py
+++ b/Lib/token.py
@@ -1,5 +1,18 @@
-# Tokens (from "token.h")
+#! /usr/bin/env python
+#
+#  Tokens (from "token.h")
+#
+#  This file is automatically generated; please don't muck it up!
+#
+#  To update the symbols in this file, 'cd' to the top directory of
+#  the python source tree after building the interpreter and run:
+#
+#    PYTHONPATH=./Lib ./python Lib/token.py
+#
+#  (this path allows the import of string.py and regexmodule.so
+#  for a site with no installation in place)
 
+#--start constants--
 ENDMARKER = 0
 NAME = 1
 NUMBER = 2
@@ -39,6 +52,9 @@ RIGHTSHIFT = 35
 DOUBLESTAR = 36
 OP = 37
 ERRORTOKEN = 38
+N_TOKENS = 39
+NT_OFFSET = 256
+#--end constants--
 
 names = dir()
 tok_name = {}
@@ -47,9 +63,6 @@ for name in names:
     if type(number) is type(0):
 	tok_name[number] = name
 
-N_TOKENS = 39				# Number of tokens including ERRORTOKEN
-NT_OFFSET = 256				# Start of non-terminal symbols
-
 def ISTERMINAL(x):
     return x < NT_OFFSET
 
@@ -58,3 +71,61 @@ def ISNONTERMINAL(x):
 
 def ISEOF(x):
     return x == ENDMARKER
+
+
+def main():
+    import regex
+    import string
+    import sys
+    args = sys.argv[1:]
+    inFileName = args and args[0] or "Include/token.h"
+    outFileName = "Lib/token.py"
+    if len(args) > 1:
+	outFileName = args[1]
+    try:
+	fp = open(inFileName)
+    except IOError, err:
+	sys.stdout.write("I/O error: %s\n" % str(err))
+	sys.exit(1)
+    lines = string.splitfields(fp.read(), "\n")
+    fp.close()
+    re = regex.compile(
+	"#define[ \t][ \t]*\([A-Z][A-Z_]*\)[ \t][ \t]*\([0-9][0-9]*\)",
+	regex.casefold)
+    tokens = {}
+    for line in lines:
+	if re.match(line) > -1:
+	    name, val = re.group(1, 2)
+	    val = string.atoi(val)
+	    tokens[val] = name		# reverse so we can sort them...
+    keys = tokens.keys()
+    keys.sort()
+    # load the output skeleton from the target:
+    try:
+	fp = open(outFileName)
+    except IOError, err:
+	sys.stderr.write("I/O error: %s\n" % str(err))
+	sys.exit(2)
+    format = string.splitfields(fp.read(), "\n")
+    fp.close()
+    try:
+	start = format.index("#--start constants--") + 1
+	end = format.index("#--end constants--")
+    except ValueError:
+	sys.stderr.write("target does not contain format markers")
+	sys.exit(3)
+    lines = []
+    for val in keys:
+	lines.append("%s = %d" % (tokens[val], val))
+    format[start:end] = lines
+    try:
+	fp = open(outFileName, 'w')
+    except IOError, err:
+	sys.stderr.write("I/O error: %s\n" % str(err))
+	sys.exit(4)
+    fp.write(string.joinfields(format, "\n"))
+    fp.close()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index bc6f516..94e22ec 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -1,21 +1,22 @@
 /*  parsermodule.c
  *
- *  Copyright 1995 by Fred L. Drake, Jr. and Virginia Polytechnic Institute
- *  and State University, Blacksburg, Virginia, USA.  Portions copyright
- *  1991-1995 by Stichting Mathematisch Centrum, Amsterdam, The Netherlands.
- *  Copying is permitted under the terms associated with the main Python
- *  distribution, with the additional restriction that this additional notice
- *  be included and maintained on all distributed copies.
+ *  Copyright 1995-1996 by Fred L. Drake, Jr. and Virginia Polytechnic
+ *  Institute and State University, Blacksburg, Virginia, USA.
+ *  Portions copyright 1991-1995 by Stichting Mathematisch Centrum,
+ *  Amsterdam, The Netherlands.  Copying is permitted under the terms
+ *  associated with the main Python distribution, with the additional
+ *  restriction that this additional notice be included and maintained
+ *  on all distributed copies.
  *
- *  This module serves to replace the original parser module written by
- *  Guido.  The functionality is not matched precisely, but the original
- *  may be implemented on top of this.  This is desirable since the source
- *  of the text to be parsed is now divorced from this interface.
- *
- *  Unlike the prior interface, the ability to give a parse tree produced
- *  by Python code as a tuple to the compiler is enabled by this module.
- *  See the documentation for more details.
+ *  This module serves to replace the original parser module written
+ *  by Guido.  The functionality is not matched precisely, but the
+ *  original may be implemented on top of this.  This is desirable
+ *  since the source of the text to be parsed is now divorced from
+ *  this interface.
  *
+ *  Unlike the prior interface, the ability to give a parse tree
+ *  produced by Python code as a tuple to the compiler is enabled by
+ *  this module.  See the documentation for more details.
  */
 
 #include "Python.h"			/* general Python API		  */
@@ -34,15 +35,15 @@
 extern char* strdup();
 
 
-
 /*  String constants used to initialize module attributes.
  *
  */
 static char*
 parser_copyright_string
-= "Copyright 1995 by Virginia Polytechnic Institute & State University and\n"
-  "Fred L. Drake, Jr., Blacksburg, Virginia, USA.  Portions copyright\n"
-  "1991-1995 by Stichting Mathematisch Centrum, Amsterdam, The Netherlands.";
+= "Copyright 1995-1996 by Virginia Polytechnic Institute & State\n"
+  "University, Blacksburg, Virginia, USA, and Fred L. Drake, Jr., Reston,\n"
+  "Virginia, USA.  Portions copyright 1991-1995 by Stichting Mathematisch\n"
+  "Centrum, Amsterdam, The Netherlands.";
 
 
 static char*
@@ -50,8 +51,11 @@ parser_doc_string
 = "This is an interface to Python's internal parser.";
 
 static char*
-parser_version_string = "0.3";		/* changed to match python version  */
+parser_version_string = "0.4";
+
 
+typedef PyObject* (*SeqMaker) (int length);
+typedef void (*SeqInserter) (PyObject* sequence, int index, PyObject* element);
 
 /*  The function below is copyrigthed by Stichting Mathematisch Centrum.  The
  *  original copyright statement is included below, and continues to apply
@@ -86,9 +90,12 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ******************************************************************/
 
 static PyObject*
-node2tuple(n)
-     node *n;
- {
+node2tuple(n, mkseq, addelem, lineno)
+     node *n;				/* node to convert		 */
+     SeqMaker mkseq;			/* create sequence		 */
+     SeqInserter addelem;		/* func. to add elem. in seq.	 */
+     int lineno;			/* include line numbers?	 */
+{
     if (n == NULL) {
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -96,7 +103,7 @@ node2tuple(n)
     if (ISNONTERMINAL(TYPE(n))) {
 	int i;
 	PyObject *v, *w;
-	v = PyTuple_New(1 + NCH(n));
+	v = mkseq(1 + NCH(n));
 	if (v == NULL)
 	    return v;
 	w = PyInt_FromLong(TYPE(n));
@@ -104,26 +111,33 @@ node2tuple(n)
 	    Py_DECREF(v);
 	    return NULL;
 	}
-	PyTuple_SetItem(v, 0, w);
+	addelem(v, 0, w);
 	for (i = 0; i < NCH(n); i++) {
-	    w = node2tuple(CHILD(n, i));
+	    w = node2tuple(CHILD(n, i), mkseq, addelem, lineno);
 	    if (w == NULL) {
 		Py_DECREF(v);
 		return NULL;
 	    }
-	    PyTuple_SetItem(v, i+1, w);
+	    addelem(v, i+1, w);
 	}
-	return v;
+	return (v);
     }
     else if (ISTERMINAL(TYPE(n))) {
-	return Py_BuildValue("(is)", TYPE(n), STR(n));
+	PyObject *result = mkseq(2 + lineno);
+	if (result != NULL) {
+	    addelem(result, 0, PyInt_FromLong(TYPE(n)));
+	    addelem(result, 1, PyString_FromString(STR(n)));
+	    if (lineno == 1)
+		addelem(result, 2, PyInt_FromLong(n->n_lineno));
+	}
+	return (result);
     }
     else {
 	PyErr_SetString(PyExc_SystemError,
 			"unrecognized parse tree node type");
 	return NULL;
     }
-}
+}   /* node2tuple() */
 /*
  *  End of material copyrighted by Stichting Mathematisch Centrum.
  */
@@ -195,7 +209,7 @@ static int
 parser_compare_nodes(left, right)
      node *left;
      node *right;
- {
+{
     int j;
 
     if (TYPE(left) < TYPE(right))
@@ -235,8 +249,7 @@ static int
 parser_compare(left, right)
      PyAST_Object *left;
      PyAST_Object *right;
- {
-
+{
     if (left == right)
 	return (0);
 
@@ -259,8 +272,7 @@ static PyObject*
 parser_newastobject(ast, type)
      node *ast;
      int type;
- {
-
+{
     PyAST_Object* o = PyObject_NEW(PyAST_Object, &PyAST_Type);
 
     if (o != 0) {
@@ -280,8 +292,7 @@ parser_newastobject(ast, type)
 static void
 parser_free(ast)
      PyAST_Object *ast;
- {
-
+{
     PyNode_Free(ast->ast_node);
     PyMem_DEL(ast);
 
@@ -298,21 +309,62 @@ static PyObject*
 parser_ast2tuple(self, args)
      PyObject *self;
      PyObject *args;
- {
+{
+    PyObject *ast;
+    PyObject *line_option = 0;
+    PyObject *res = 0;
+
+    if (PyArg_ParseTuple(args, "O!|O:ast2tuple", &PyAST_Type, &ast,
+			 &line_option)) {
+	int lineno = 0;
+	if (line_option != 0) {
+	    lineno = PyObject_IsTrue(line_option);
+	    lineno = lineno ? 1 : 0;
+	}
+	/*
+	 *  Convert AST into a tuple representation.  Use Guido's function,
+	 *  since it's known to work already.
+	 */
+	res = node2tuple(((PyAST_Object*)ast)->ast_node,
+			 PyTuple_New, PyTuple_SetItem, lineno);
+    }
+    return (res);
+
+}   /* parser_ast2tuple() */
 
-    PyObject* ast;
-    PyObject* res = 0;
 
-    if (PyArg_ParseTuple(args, "O!:ast2tuple", &PyAST_Type, &ast)) {
+/*  parser_ast2tuple(PyObject* self, PyObject* args)
+ *
+ *  This provides conversion from a node* to a tuple object that can be
+ *  returned to the Python-level caller.  The AST object is not modified.
+ *
+ */
+static PyObject*
+parser_ast2list(self, args)
+     PyObject *self;
+     PyObject *args;
+{
+    PyObject *ast;
+    PyObject *line_option = 0;
+    PyObject *res = 0;
+
+    if (PyArg_ParseTuple(args, "O!|O:ast2list", &PyAST_Type, &ast,
+			 &line_option)) {
+	int lineno = 0;
+	if (line_option != 0) {
+	    lineno = PyObject_IsTrue(line_option);
+	    lineno = lineno ? 1 : 0;
+	}
 	/*
 	 *  Convert AST into a tuple representation.  Use Guido's function,
 	 *  since it's known to work already.
 	 */
-	res = node2tuple(((PyAST_Object*)ast)->ast_node);
+	res = node2tuple(((PyAST_Object*)ast)->ast_node,
+			 PyList_New, PyList_SetItem, lineno);
     }
     return (res);
 
-}   /* parser_ast2tuple() */
+}   /* parser_ast2list() */
 
 
 /*  parser_compileast(PyObject* self, PyObject* args)
@@ -325,8 +377,7 @@ static PyObject*
 parser_compileast(self, args)
      PyObject *self;
      PyObject *args;
- {
-
+{
     PyAST_Object* ast;
     PyObject*     res = 0;
     char*	  str = "<ast>";
@@ -350,7 +401,7 @@ static PyObject*
 parser_isexpr(self, args)
      PyObject *self;
      PyObject *args;
- {
+{
     PyAST_Object* ast;
     PyObject* res = 0;
 
@@ -370,8 +421,7 @@ static PyObject*
 parser_issuite(self, args)
      PyObject *self;
      PyObject *args;
- {
-
+{
     PyAST_Object* ast;
     PyObject* res = 0;
 
@@ -395,7 +445,7 @@ parser_issuite(self, args)
 static void
 err_string(message)
      char *message;
- {
+{
     PyErr_SetString(parser_error, message);
 
 }  /* err_string() */
@@ -411,8 +461,7 @@ static PyObject*
 parser_do_parse(args, type)
      PyObject *args;
      int type;
- {
-
+{
     char*     string = 0;
     PyObject* res    = 0;
 
@@ -443,8 +492,7 @@ static PyObject*
 parser_expr(self, args)
      PyObject *self;
      PyObject *args;
- {
-
+{
     return (parser_do_parse(args, PyAST_EXPR));
 
 }   /* parser_expr() */
@@ -454,8 +502,7 @@ static PyObject*
 parser_suite(self, args)
      PyObject *self;
      PyObject *args;
- {
-
+{
     return (parser_do_parse(args, PyAST_SUITE));
 
 }   /* parser_suite() */
@@ -501,60 +548,87 @@ static PyObject*
 parser_tuple2ast(self, args)
      PyObject *self;
      PyObject *args;
- {
-
-    PyObject* ast	= 0;
-    PyObject* tuple	= 0;
-
-    if ((PyObject_Length(args) == 1)
-	&& (tuple = PySequence_GetItem(args, 0))
-	&& PySequence_Check(tuple)
-	&& (PyObject_Length(tuple) >= 2)
-	&& PyInt_Check(PySequence_GetItem(tuple, 0))
-	&& PySequence_Check(PySequence_GetItem(tuple, 1))
-	&& (PyObject_Length(PySequence_GetItem(tuple, 1)) >= 2)
-	&& PyInt_Check(PySequence_GetItem(PySequence_GetItem(tuple, 1), 0))) {
-
-	/*
-	 *  This might be a valid parse tree, but let's do a quick check
-	 *  before we jump the gun.
-	 */
-
-	int start_sym = PyInt_AsLong(PySequence_GetItem(tuple, 0));
-
-	if (start_sym == eval_input) {
-	    /*
-	     *  Might be an eval form.
-	     */
-	    node* expression = build_node_tree(PySequence_GetItem(args, 0));
+{
+    PyObject *ast = 0;
+    PyObject *tuple = 0;
+    PyObject *temp = 0;
+    int ok;
+    int start_sym;
 
-	    if ((expression != 0) && validate_expr_tree(expression))
-		ast = parser_newastobject(expression, PyAST_EXPR);
+    if (!PyArg_ParseTuple(args, "O:tuple2ast", &tuple))
+	return (0);
+    if (!PySequence_Check(tuple)) {
+	PyErr_SetString(PyExc_ValueError,
+			"tuple2ast() requires a single sequence argument");
+	return (0);
+    }
+    /*
+     *	This mess of tests is written this way so we can use the abstract
+     *	object interface (AOI).  Unfortunately, the AOI increments reference
+     *	counts, which requires that we store a pointer to retrieved object
+     *	so we can DECREF it after the check.  But we really should accept
+     *	lists as well as tuples at the very least.
+     */
+    ok = PyObject_Length(tuple) >= 2;
+    if (ok) {
+	temp = PySequence_GetItem(tuple, 0);
+	ok = (temp != NULL) && PyInt_Check(temp);
+	if (ok)
+	    /* this is used after the initial checks: */
+	    start_sym = PyInt_AsLong(temp);
+	Py_XDECREF(temp);
+    }
+    if (ok) {
+	temp = PySequence_GetItem(tuple, 1);
+	ok = (temp != NULL) && PySequence_Check(temp);
+	Py_XDECREF(temp);
+    }
+    if (ok) {
+	temp = PySequence_GetItem(tuple, 1);
+	ok = (temp != NULL) && PyObject_Length(temp) >= 2;
+	if (ok) {
+	    PyObject *temp2 = PySequence_GetItem(temp, 0);
+	    if (temp2 != NULL) {
+		ok = PyInt_Check(temp2);
+		Py_DECREF(temp2);
+	    }
 	}
-	else if (start_sym == file_input) {
-	    /*
-	     *  This looks like an exec form so far.
-	     */
-	    node* suite_tree = build_node_tree(PySequence_GetItem(args, 0));
+	Py_XDECREF(temp);
+    }
+    /* If we've failed at some point, get out of here. */
+    if (!ok) {
+	err_string("malformed sequence for tuple2ast()");
+	return (0);
+    }
+    /*
+     *  This might be a valid parse tree, but let's do a quick check
+     *  before we jump the gun.
+     */
+    if (start_sym == eval_input) {
+	/*  Might be an eval form.  */
+	node* expression = build_node_tree(tuple);
 
-	    if ((suite_tree != 0) && validate_file_input(suite_tree))
-		ast = parser_newastobject(suite_tree, PyAST_SUITE);
-	}
-	else
-	    /*	This is a fragment, and is not yet supported.  Maybe they
-	     *	will be if I find a use for them.
-	     */
-	    err_string("Fragmentary parse trees not supported.");
+	if ((expression != 0) && validate_expr_tree(expression))
+	    ast = parser_newastobject(expression, PyAST_EXPR);
+    }
+    else if (start_sym == file_input) {
+	/*  This looks like an exec form so far.  */
+	node* suite_tree = build_node_tree(tuple);
 
-	/*  Make sure we throw an exception on all errors.  We should never
-	 *  get this, but we'd do well to be sure something is done.
-	 */
-	if ((ast == 0) && !PyErr_Occurred())
-	    err_string("Unspecified ast error occurred.");
+	if ((suite_tree != 0) && validate_file_input(suite_tree))
+	    ast = parser_newastobject(suite_tree, PyAST_SUITE);
     }
     else
-	PyErr_SetString(PyExc_TypeError,
-			"parser.tuple2ast(): expected single tuple.");
+	/*  This is a fragment, and is not yet supported.  Maybe they
+	 *  will be if I find a use for them.
+	 */
+	err_string("Fragmentary parse trees not supported.");
+
+    /*  Make sure we throw an exception on all errors.  We should never
+     *  get this, but we'd do well to be sure something is done.
+     */
+    if ((ast == 0) && !PyErr_Occurred())
+	err_string("Unspecified ast error occurred.");
 
     return (ast);
 
@@ -563,36 +637,43 @@ parser_tuple2ast(self, args)
 
 /*  int check_terminal_tuple()
  *
- *  Check a tuple to determine that it is indeed a valid terminal node.  The
- *  node is known to be required as a terminal, so we throw an exception if
- *  there is a failure.  The portion of the resulting node tree already built
- *  is passed in so we can deallocate it in the event of a failure.
- *
- *  The format of an acceptable terminal tuple is "(is)":  the fact that elem
- *  is a tuple and the integer is a valid terminal symbol has been established
- *  before this function is called.  We must check the length of the tuple and
- *  the type of the second element.  We do *NOT* check the actual text of the
- *  string element, which we could do in many cases.  This is done by the
- *  validate_*() functions which operate on the internal representation.
+ *  Check a tuple to determine that it is indeed a valid terminal
+ *  node.  The node is known to be required as a terminal, so we throw
+ *  an exception if there is a failure.
  *
+ *  The format of an acceptable terminal tuple is "(is[i])": the fact
+ *  that elem is a tuple and the integer is a valid terminal symbol
+ *  has been established before this function is called.  We must
+ *  check the length of the tuple and the type of the second element
+ *  and optional third element.  We do *NOT* check the actual text of
+ *  the string element, which we could do in many cases.  This is done
+ *  by the validate_*() functions which operate on the internal
+ *  representation.
  */
 static int
-check_terminal_tuple(elem, result)
+check_terminal_tuple(elem)
      PyObject *elem;
-     node *result;
- {
-
-    int   res = 0;
-    char* str = 0;
+{
+    int   len = PyObject_Length(elem);
+    int   res = 1;
+    char* str = "Illegal terminal symbol; bad node length.";
 
-    if (PyObject_Length(elem) != 2)
-	str = "Illegal terminal symbol; node too long.";
-    else if (!PyString_Check(PySequence_GetItem(elem, 1)))
+    if ((len == 2) || (len == 3)) {
+	PyObject *temp = PySequence_GetItem(elem, 1);
+	res = PyString_Check(temp);
 	str = "Illegal terminal symbol; expected a string.";
-    else
-	res = 1;
-
-    if ((res == 0) && (result != 0)) {
+	if (res && (len == 3)) {
+	    PyObject* third = PySequence_GetItem(elem, 2);
+	    res = PyInt_Check(third);
+	    str = "Invalid third element of terminal node.";
+	    Py_XDECREF(third);
+	}
+	Py_XDECREF(temp);
+    }
+    else {
+	res = 0;
+    }
+    if (!res) {
 	elem = Py_BuildValue("(os)", elem, str);
 	PyErr_SetObject(parser_error, elem);
     }
@@ -614,31 +695,54 @@ build_node_children(tuple, root, line_num)
      PyObject *tuple;
      node *root;
      int *line_num;
- {
-
+{
     int len = PyObject_Length(tuple);
     int i;
 
     for (i = 1; i < len; ++i) {
 	/* elem must always be a tuple, however simple */
 	PyObject* elem = PySequence_GetItem(tuple, i);
-	long      type = 0;
-	char*     strn = 0;
-
-	if ((!PySequence_Check(elem))
-	    || !PyInt_Check(PySequence_GetItem(elem, 0))) {
+	int ok = elem != NULL;
+	long  type = 0;
+	char *strn = 0;
+
+	if (ok)
+	    ok = PySequence_Check(elem);
+	if (ok) {
+	    PyObject *temp = PySequence_GetItem(elem, 0);
+	    if (temp == NULL)
+		ok = 0;
+	    else {
+		ok = PyInt_Check(temp);
+		if (ok)
+		    type = PyInt_AsLong(temp);
+		Py_DECREF(temp);
+	    }
+	}
+	if (!ok) {
 	    PyErr_SetObject(parser_error,
 			    Py_BuildValue("(os)", elem,
 					  "Illegal node construct."));
+	    Py_XDECREF(elem);
 	    return (0);
 	}
-	type = PyInt_AsLong(PySequence_GetItem(elem, 0));
-
 	if (ISTERMINAL(type)) {
-	    if (check_terminal_tuple(elem, root))
-		strn = strdup(PyString_AsString(PySequence_GetItem(elem, 1)));
-	    else
+	    if (check_terminal_tuple(elem)) {
+		PyObject *temp = PySequence_GetItem(elem, 1);
+
+		strn = strdup(PyString_AsString(temp));
+		Py_XDECREF(temp);
+
+		if (PyObject_Length(elem) == 3) {
+		    PyObject* temp = PySequence_GetItem(elem, 2);
+		    *line_num = PyInt_AsLong(temp);
+		    Py_DECREF(temp);
+		}
+	    }
+	    else {
+		Py_XDECREF(elem);
 		return (0);
+	    }
 	}
 	else if (!ISNONTERMINAL(type)) {
 	    /*
@@ -648,6 +752,7 @@ build_node_children(tuple, root, line_num)
 	    PyErr_SetObject(parser_error,
 			    Py_BuildValue("(os)", elem,
 					  "Unknown node type."));
+	    Py_XDECREF(elem);
 	    return (0);
 	}
 	PyNode_AddChild(root, type, strn, *line_num);
@@ -655,11 +760,15 @@ build_node_children(tuple, root, line_num)
 	if (ISNONTERMINAL(type)) {
 	    node* new_child = CHILD(root, i - 1);
 
-	    if (new_child != build_node_children(elem, new_child, line_num))
+	    if (new_child != build_node_children(elem, new_child, line_num)) {
+		Py_XDECREF(elem);
 		return (0);
+	    }
 	}
-	else if (type == NEWLINE)	/* It's true:  we increment the     */
+	else if (type == NEWLINE) {	/* It's true:  we increment the     */
 	    ++(*line_num);		/* line number *after* the newline! */
+	}
+	Py_XDECREF(elem);
     }
     return (root);
 
@@ -669,11 +778,14 @@ build_node_children(tuple, root, line_num)
 static node*
 build_node_tree(tuple)
      PyObject *tuple;
- {
-
+{
     node* res = 0;
-    long  num = PyInt_AsLong(PySequence_GetItem(tuple, 0));
+    PyObject *temp = PySequence_GetItem(tuple, 0);
+    long  num = -1;
 
+    if (temp != NULL)
+	num = PyInt_AsLong(temp);
+    Py_XDECREF(temp);
     if (ISTERMINAL(num)) {
 	/*
 	 *  The tuple is simple, but it doesn't start with a start symbol.
@@ -737,11 +849,9 @@ staticforward int validate_terminal();
 #define	validate_star(ch)	validate_terminal(ch,	    STAR, "*")
 #define	validate_vbar(ch)	validate_terminal(ch,	    VBAR, "|")
 #define validate_doublestar(ch)	validate_terminal(ch, DOUBLESTAR, "**")
+#define validate_dot(ch)	validate_terminal(ch,	     DOT, ".")
 #define	validate_name(ch, str)	validate_terminal(ch,	    NAME, str)
 
-#if defined(access_stmt) && defined(accesstype)
-VALIDATER(access_stmt);		VALIDATER(accesstype);
-#endif
 VALIDATER(node);		VALIDATER(small_stmt);
 VALIDATER(class);		VALIDATER(node);
 VALIDATER(parameters);		VALIDATER(suite);
@@ -764,6 +874,7 @@ VALIDATER(shift_expr);		VALIDATER(arith_expr);
 VALIDATER(term);		VALIDATER(factor);
 VALIDATER(atom);		VALIDATER(lambdef);
 VALIDATER(trailer);		VALIDATER(subscript);
+VALIDATER(subscriptlist);	VALIDATER(sliceop);
 VALIDATER(exprlist);		VALIDATER(dictmaker);
 VALIDATER(arglist);		VALIDATER(argument);
 
@@ -776,7 +887,7 @@ static int
 validate_ntype(n, t)
      node *n;
      int t;
- {
+{
     int res = (TYPE(n) == t);
 
     if (!res) {
@@ -794,7 +905,7 @@ validate_numnodes(n, num, name)
      node *n;
      int num;
      const char *const name;
- {
+{
     if (NCH(n) != num) {
 	char buff[60];
 	sprintf(buff, "Illegal number of children for %s node.", name);
@@ -810,7 +921,7 @@ validate_terminal(terminal, type, string)
      node *terminal;
      int type;
      char *string;
- {
+{
     int res = (validate_ntype(terminal, type)
 	       && ((string == 0) || (strcmp(string, STR(terminal)) == 0)));
 
@@ -824,11 +935,42 @@ validate_terminal(terminal, type, string)
 }   /* validate_terminal() */
 
 
+/*  X (',' X) [',']
+ */
+static int
+validate_repeating_list(tree, ntype, vfunc, name)
+    node *tree;
+    int ntype;
+    int (*vfunc)();
+    const char *const name;
+{
+    int nch = NCH(tree);
+    int res = (nch && validate_ntype(tree, ntype)
+	       && vfunc(CHILD(tree, 0)));
+
+    if (!res && !PyErr_Occurred())
+	validate_numnodes(tree, 1, name);
+    else {
+	if (is_even(nch))
+	    res = validate_comma(CHILD(tree, --nch));
+	if (res && nch > 1) {
+	    int pos = 1;
+	    for ( ; res && pos < nch; pos += 2)
+		res = (validate_comma(CHILD(tree, pos))
+		       && vfunc(CHILD(tree, pos + 1)));
+	}
+    }
+    return (res);
+
+}   /* validate_repeating_list() */
+
+
 /*  VALIDATE(class)
  *
  *  classdef:
  *	'class' NAME ['(' testlist ')'] ':' suite
  */
+static int
 validate_class(tree)
     node *tree;
 {
@@ -856,6 +998,7 @@ validate_class(tree)
 /*  if_stmt:
  *	'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
  */
+static int
 validate_if(tree)
     node *tree;
 {
@@ -899,6 +1042,7 @@ validate_if(tree)
  *	'(' [varargslist] ')'
  *
  */
+static int
 validate_parameters(tree)
     node *tree;
 {
@@ -925,6 +1069,7 @@ validate_parameters(tree)
  *	simple_stmt
  *    | NEWLINE INDENT stmt+ DEDENT
  */
+static int
 validate_suite(tree)
     node *tree;
 {
@@ -954,34 +1099,12 @@ validate_suite(tree)
 }   /* validate_suite() */
 
 
+static int
 validate_testlist(tree)
     node *tree;
 {
-    int i;
-    int nch = NCH(tree);
-    int res = validate_ntype(tree, testlist) && (nch >= 1);
-
-    /*	If there are an even, non-zero number of children, the last one
-     *	absolutely must be a comma.  Why the trailing comma is allowed,
-     *	I have no idea!
-     */
-    if (res && is_even(nch))
-	res = validate_comma(CHILD(tree, --nch));
-
-    if (res) {
-	/*
-	 *  If the number is odd, the last is a test, and can be
-	 *  verified.  What's left, if anything, can be verified
-	 *  as a list of [test, comma] pairs.
-	 */
-	--nch;
-	res = validate_test(CHILD(tree, nch));
-    }
-    for (i = 0; res && (i < nch); i += 2)
-	res = (validate_test(CHILD(tree, i))
-	       && validate_comma(CHILD(tree, i + 1)));
-
-    return (res);
+    return (validate_repeating_list(tree, testlist,
+				    validate_test, "testlist"));
 
 }   /* validate_testlist() */
 
@@ -998,6 +1121,7 @@ validate_testlist(tree)
  *    | fpdef ['=' test] (',' fpdef ['=' test])* [',']
  *
  */
+static int
 validate_varargslist(tree)
     node *tree;
 {
@@ -1100,6 +1224,7 @@ validate_varargslist(tree)
  *	NAME
  *    | '(' fplist ')'
  */
+static int
 validate_fpdef(tree)
     node *tree;
 {
@@ -1121,22 +1246,12 @@ validate_fpdef(tree)
 } /* validate_fpdef() */
 
 
+static int
 validate_fplist(tree)
     node *tree;
 {
-    int j;
-    int nch = NCH(tree);
-    int res = (validate_ntype(tree, fplist)
-	       && (nch != 0) && validate_fpdef(CHILD(tree, 0)));
-
-    if (res && is_even(nch))
-	res = validate_comma(CHILD(tree, --nch));
-
-    for (j = 1; res && (j < nch); j += 2)
-	res = (validate_comma(CHILD(tree, j))
-	       && validate_fpdef(CHILD(tree, j + 1)));
-
-    return (res);
+    return (validate_repeating_list(tree, fplist,
+				    validate_fpdef, "fplist"));
 
 }   /* validate_fplist() */
 
@@ -1144,6 +1259,7 @@ validate_fplist(tree)
 /*  simple_stmt | compound_stmt
  *
  */
+static int
 validate_stmt(tree)
     node *tree;
 {
@@ -1166,6 +1282,7 @@ validate_stmt(tree)
 /*  small_stmt (';' small_stmt)* [';'] NEWLINE
  *
  */
+static int
 validate_simple_stmt(tree)
     node *tree;
 {
@@ -1192,6 +1309,7 @@ validate_simple_stmt(tree)
 }   /* validate_simple_stmt() */
 
 
+static int
 validate_small_stmt(tree)
     node *tree;
 {
@@ -1204,9 +1322,6 @@ validate_small_stmt(tree)
 		   || (TYPE(CHILD(tree, 0)) == flow_stmt)
 		   || (TYPE(CHILD(tree, 0)) == import_stmt)
 		   || (TYPE(CHILD(tree, 0)) == global_stmt)
-#if defined(access_stmt) && defined(accesstype)
-		   || (TYPE(CHILD(tree, 0)) == access_stmt)
-#endif
 		   || (TYPE(CHILD(tree, 0)) == exec_stmt)));
 
     if (res)
@@ -1225,6 +1340,7 @@ validate_small_stmt(tree)
 /*  compound_stmt:
  *	if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef
  */
+static int
 validate_compound_stmt(tree)
     node *tree;
 {
@@ -1253,6 +1369,7 @@ validate_compound_stmt(tree)
 }   /* validate_compound_stmt() */
 
 
+static int
 validate_expr_stmt(tree)
     node *tree;
 {
@@ -1276,6 +1393,7 @@ validate_expr_stmt(tree)
  *	'print' (test ',')* [test]
  *
  */
+static int
 validate_print_stmt(tree)
     node *tree;
 {
@@ -1300,6 +1418,7 @@ validate_print_stmt(tree)
 }   /* validate_print_stmt() */
 
 
+static int
 validate_del_stmt(tree)
     node *tree;
 {
@@ -1310,6 +1429,7 @@ validate_del_stmt(tree)
 }   /* validate_del_stmt() */
 
 
+static int
 validate_return_stmt(tree)
     node *tree;
 {
@@ -1326,6 +1446,7 @@ validate_return_stmt(tree)
 }   /* validate_return_stmt() */
 
 
+static int
 validate_raise_stmt(tree)
     node *tree;
 {
@@ -1360,6 +1481,7 @@ validate_raise_stmt(tree)
  *    'import' dotted_name (',' dotted_name)*
  *  | 'from' dotted_name 'import' ('*' | NAME (',' NAME)*)
  */
+static int
 validate_import_stmt(tree)
     node *tree;
 {
@@ -1402,6 +1524,7 @@ validate_import_stmt(tree)
 }   /* validate_import_stmt() */
 
 
+static int
 validate_global_stmt(tree)
     node *tree;
 {
@@ -1422,67 +1545,11 @@ validate_global_stmt(tree)
 }   /* validate_global_stmt() */
 
 
-#if defined(access_stmt) && defined(accesstype)
-/*  VALIDATE(accesstype)
- *
- *  This should be removed as soon as the 'access' statement is actually
- *  removed from the language.  The conditional compilation should help.
- */
-validate_access_stmt(tree)
-    node *tree;
-{
-    int pos = 3;
-    int nch = NCH(tree);
-    int res = (validate_ntype(tree, access_stmt)
-	       && (nch >= 4) && is_even(nch)
-	       && validate_name(CHILD(tree, 0), "access")
-	       && validate_accesstype(CHILD(tree, nch - 1)));
-
-    if (res && (TYPE(CHILD(tree, 1)) != STAR)) {
-	int j;
-
-	res = validate_ntype(CHILD(tree, 1), NAME);
-	for (j = 2; res && (j < (nch - 2)); j += 2) {
-	    if (TYPE(CHILD(tree, j)) == COLON)
-		break;
-	    res = (validate_comma(CHILD(tree, j))
-		   && validate_ntype(CHILD(tree, j + 1), NAME)
-		   && (pos += 2));
-	}
-    }
-    else
-	res = validate_star(CHILD(tree, 1));
-
-    res = (res && validate_colon(CHILD(tree, pos - 1)));
-    for (; res && (pos < (nch - 1)); pos += 2)
-	res = (validate_accesstype(CHILD(tree, pos))
-	       && validate_comma(CHILD(tree, pos + 1)));
-
-    return (res && (pos == (nch - 1)));
-
-}   /* validate_access_stmt() */
-
-
-validate_accesstype(tree)
-    node *tree;
-{
-    int nch = NCH(tree);
-    int res = validate_ntype(tree, accesstype) && (nch >= 1);
-    int i;
-
-    for (i = 0; res && (i < nch); ++i)
-	res = validate_ntype(CHILD(tree, i), NAME);
-
-    return (res);
-
-}   /* validate_accesstype() */
-#endif
-
-
 /*  exec_stmt:
  *
  *  'exec' expr ['in' test [',' test]]
  */
+static int
 validate_exec_stmt(tree)
     node *tree;
 {
@@ -1506,6 +1573,7 @@ validate_exec_stmt(tree)
 }   /* validate_exec_stmt() */
 
 
+static int
 validate_while(tree)
     node *tree;
 {
@@ -1527,6 +1595,7 @@ validate_while(tree)
 }   /* validate_while() */
 
 
+static int
 validate_for(tree)
     node *tree;
 {
@@ -1555,6 +1624,7 @@ validate_for(tree)
  *    | 'try' ':' suite 'finally' ':' suite
  *
  */
+static int
 validate_try(tree)
     node *tree;
 {
@@ -1610,6 +1680,7 @@ validate_try(tree)
 }   /* validate_try() */
 
 
+static int
 validate_except_clause(tree)
     node *tree;
 {
@@ -1629,6 +1700,7 @@ validate_except_clause(tree)
 }   /* validate_except_clause() */
 
 
+static int
 validate_test(tree)
     node *tree;
 {
@@ -1650,6 +1722,7 @@ validate_test(tree)
 }   /* validate_test() */
 
 
+static int
 validate_and_test(tree)
     node *tree;
 {
@@ -1668,6 +1741,7 @@ validate_and_test(tree)
 }   /* validate_and_test() */
 
 
+static int
 validate_not_test(tree)
     node *tree;
 {
@@ -1686,6 +1760,7 @@ validate_not_test(tree)
 }   /* validate_not_test() */
 
 
+static int
 validate_comparison(tree)
     node *tree;
 {
@@ -1704,6 +1779,7 @@ validate_comparison(tree)
 }   /* validate_comparison() */
 
 
+static int
 validate_comp_op(tree)
     node *tree;
 {
@@ -1757,6 +1833,7 @@ validate_comp_op(tree)
 }   /* validate_comp_op() */
 
 
+static int
 validate_expr(tree)
     node *tree;
 {
@@ -1775,6 +1852,7 @@ validate_expr(tree)
 }   /* validate_expr() */
 
 
+static int
 validate_xor_expr(tree)
     node *tree;
 {
@@ -1793,6 +1871,7 @@ validate_xor_expr(tree)
 }   /* validate_xor_expr() */
 
 
+static int
 validate_and_expr(tree)
     node *tree;
 {
@@ -1834,6 +1913,7 @@ validate_chain_two_ops(tree, termvalid, op1, op2)
 }   /* validate_chain_two_ops() */
 
 
+static int
 validate_shift_expr(tree)
     node *tree;
 {
@@ -1844,6 +1924,7 @@ validate_shift_expr(tree)
 }   /* validate_shift_expr() */
 
 
+static int
 validate_arith_expr(tree)
     node *tree;
 {
@@ -1853,6 +1934,7 @@ validate_arith_expr(tree)
 }   /* validate_arith_expr() */
 
 
+static int
 validate_term(tree)
     node *tree;
 {
@@ -1877,6 +1959,7 @@ validate_term(tree)
  *
  *  factor: ('+'|'-'|'~') factor | power
  */
+static int
 validate_factor(tree)
     node *tree;
 {
@@ -1898,6 +1981,7 @@ validate_factor(tree)
  *
  *  power: atom trailer* ('**' factor)*
  */
+static int
 validate_power(tree)
     node *tree;
 {
@@ -1922,6 +2006,7 @@ validate_power(tree)
 }   /* validate_power() */
 
 
+static int
 validate_atom(tree)
     node *tree;
 {
@@ -1979,6 +2064,7 @@ validate_atom(tree)
  *	'def' NAME parameters ':' suite
  *
  */
+static int
 validate_funcdef(tree)
     node *tree;
 {
@@ -1993,6 +2079,7 @@ validate_funcdef(tree)
 }   /* validate_funcdef() */
 
 
+static int
 validate_lambdef(tree)
     node *tree;
 {
@@ -2017,26 +2104,12 @@ validate_lambdef(tree)
  *
  *  argument (',' argument)* [',']
  */
+static int
 validate_arglist(tree)
     node *tree;
 {
-    int nch = NCH(tree);
-    int res = (validate_ntype(tree, arglist)
-	       && (nch > 0)
-	       && validate_argument(CHILD(tree, 0)));
-
-    if (res && is_even(nch))
-	res = validate_comma(CHILD(tree, nch - 1));
-    if (!res && !PyErr_Occurred())
-	validate_numnodes(tree, 1, "arglist");
-    --nch;
-    if (res && (nch > 1)) {
-	int j = 1;
-	for ( ; res && (j < (nch - 2)); j += 2)
-	    res = (validate_comma(CHILD(tree, j))
-		   && validate_argument(CHILD(tree, j + 1)));
-    }
-    return (res);
+    return (validate_repeating_list(tree, arglist,
+				    validate_argument, "arglist"));
 
 }   /* validate_arglist() */
 
@@ -2046,6 +2119,7 @@ validate_arglist(tree)
  *
  *  [test '='] test
  */
+static int
 validate_argument(tree)
     node *tree;
 {
@@ -2066,8 +2140,9 @@ validate_argument(tree)
 
 /*  trailer:
  *
- *  '(' [arglist] ')' | '[' subscript ']' | '.' NAME
+ *  '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
  */
+static int
 validate_trailer(tree)
     node *tree;
 {
@@ -2083,7 +2158,7 @@ validate_trailer(tree)
 	    break;
 	  case LSQB:
 	    res = (validate_numnodes(tree, 3, "trailer")
-		   && validate_subscript(CHILD(tree, 1))
+		   && validate_subscriptlist(CHILD(tree, 1))
 		   && validate_ntype(CHILD(tree, 2), RSQB));
 	    break;
 	  case DOT:
@@ -2103,75 +2178,109 @@ validate_trailer(tree)
 }   /* validate_trailer() */
 
 
+/*  subscriptlist:
+ *
+ *  subscript (',' subscript)* [',']
+ */
+static int
+validate_subscriptlist(tree)
+    node *tree;
+{
+    return (validate_repeating_list(tree, subscriptlist,
+				    validate_subscript, "subscriptlist"));
+
+}   /* validate_subscriptlist() */
+
+
 /*  subscript:
  *
- *  test (',' test)* [','] | [test] ':' [test]
+ *  '.' '.' '.' | test | [test] ':' [test] [sliceop]
  */
+static int
 validate_subscript(tree)
     node *tree;
 {
+    int offset = 0;
     int nch = NCH(tree);
-    int res = validate_ntype(tree, subscript) && (nch >= 1);
+    int res = validate_ntype(tree, subscript) && (nch >= 1) && (nch <= 4);
 
-    if (res && is_even(nch) && (nch >= 4))
-	if (TYPE(CHILD(tree, nch - 1)) == COMMA)
-	    --nch;
-	else
-	    res = 0;
-    if (res && is_odd(nch)) {
-	if (TYPE(CHILD(tree, 0)) == COLON)
-	    res = validate_numnodes(tree, 1, "subscript");
-	else {
-	    res = validate_test(CHILD(tree, 0));
-	    if (res && (nch == 3))
-		res = ((TYPE(CHILD(tree, 1)) == COMMA)
-			|| validate_colon(CHILD(tree, 1)))
-		       && validate_test(CHILD(tree, 2));
-	    else if ((res && (nch >= 5))) {
-		int pos = 1;
-		while (res && (pos <= (nch - 2))) {
-		    res = (validate_comma(CHILD(tree, pos))
-			   && validate_test(CHILD(tree, pos + 1)));
-		    pos += 2;
-		}
-	    }
-	}
+    if (!res) {
+	if (!PyErr_Occurred())
+	    err_string("invalid number of arguments for subscript node");
+	return (0);
     }
-    else if (nch == 2) {
-	if (TYPE(CHILD(tree, 0)) == COLON)
-	    res = validate_test(CHILD(tree, 1));
-	else if (TYPE(CHILD(tree, 1)) == COLON)
+    if (TYPE(CHILD(tree, 0)) == DOT)
+	/* take care of ('.' '.' '.') possibility */
+	return (validate_numnodes(tree, 3, "subscript")
+		&& validate_dot(CHILD(tree, 0))
+		&& validate_dot(CHILD(tree, 1))
+		&& validate_dot(CHILD(tree, 2)));
+    if (nch == 1) {
+	if (TYPE(CHILD(tree, 0)) == test)
 	    res = validate_test(CHILD(tree, 0));
 	else
-	    res = (validate_test(CHILD(tree, 0))
-		   && validate_comma(CHILD(tree, 1)));
+	    res = validate_colon(CHILD(tree, 0));
+	return (res);
+    }
+    /*	Must be [test] ':' [test] [sliceop],
+     *	but at least one of the optional components will
+     *	be present, but we don't know which yet.
+     */
+    if ((TYPE(CHILD(tree, 0)) != COLON) || (nch == 4)) {
+	res = validate_test(CHILD(tree, 0));
+	offset = 1;
+    }
+    if (res)
+	res = validate_colon(CHILD(tree, offset));
+    if (res) {
+	int rem = nch - ++offset;
+	if (rem) {
+	    if (TYPE(CHILD(tree, offset)) == test) {
+		res = validate_test(CHILD(tree, offset));
+		++offset;
+		--rem;
+	    }
+	    if (res && rem)
+		res = validate_sliceop(CHILD(tree, offset));
+	}
     }
     return (res);
 
 }   /* validate_subscript() */
 
 
-validate_exprlist(tree)
+static int
+validate_sliceop(tree)
     node *tree;
 {
     int nch = NCH(tree);
-    int res = (validate_ntype(tree, exprlist)
-	       && (nch >= 1)
-	       && validate_expr(CHILD(tree, 0)));
-
-    if (res && is_even(nch))
-	res = validate_comma(CHILD(tree, --nch));
-    if (res && (nch > 1)) {
-	int pos;
-	for (pos = 1; res && (pos < nch); pos += 2)
-	    res = (validate_comma(CHILD(tree, pos))
-		   && validate_expr(CHILD(tree, pos + 1)));
+    int res = ((nch == 1) || validate_numnodes(tree, 2, "sliceop"))
+	      && validate_ntype(tree, sliceop);
+    if (!res && !PyErr_Occurred()) {
+	validate_numnodes(tree, 1, "sliceop");
+	res = 0;
     }
+    if (res)
+	res = validate_colon(CHILD(tree, 0));
+    if (res && (nch == 2))
+	res = validate_test(CHILD(tree, 1));
+
     return (res);
 
+}   /* validate_sliceop() */
+
+
+static int
+validate_exprlist(tree)
+    node *tree;
+{
+    return (validate_repeating_list(tree, exprlist,
+				    validate_expr, "exprlist"));
+
 }   /* validate_exprlist() */
 
 
+static int
 validate_dictmaker(tree)
     node *tree;
 {
@@ -2203,6 +2312,7 @@ validate_dictmaker(tree)
 }   /* validate_dictmaker() */
 
 
+static int
 validate_eval_input(tree)
     node *tree;
 {
@@ -2221,6 +2331,7 @@ validate_eval_input(tree)
 }   /* validate_eval_input() */
 
 
+static int
 validate_node(tree)
     node *tree;
 {
@@ -2251,7 +2362,7 @@ validate_node(tree)
 	  case small_stmt:
 	    /*
 	     *  expr_stmt | print_stmt  | del_stmt | pass_stmt | flow_stmt
-	     *  | import_stmt | global_stmt | access_stmt | exec_stmt
+	     *  | import_stmt | global_stmt | exec_stmt
 	     */
 	    res = validate_small_stmt(tree);
 	    break;
@@ -2311,11 +2422,6 @@ validate_node(tree)
 	  case global_stmt:
 	    res = validate_global_stmt(tree);
 	    break;
-#if defined(access_stmt) && defined(accesstype)
-	  case access_stmt:
-	    res = validate_access_stmt(tree);
-	    break;
-#endif
 	  case exec_stmt:
 	    res = validate_exec_stmt(tree);
 	    break;
@@ -2399,6 +2505,7 @@ validate_node(tree)
 }   /* validate_node() */
 
 
+static int
 validate_expr_tree(tree)
     node *tree;
 {
@@ -2415,6 +2522,7 @@ validate_expr_tree(tree)
 /*  file_input:
  *	(NEWLINE | stmt)* ENDMARKER
  */
+static int
 validate_file_input(tree)
     node *tree;
 {
@@ -2450,6 +2558,8 @@ validate_file_input(tree)
 static PyMethodDef parser_functions[] =  {
     {"ast2tuple",	parser_ast2tuple,	1,
 	"Creates a tuple-tree representation of an AST."},
+    {"ast2list",	parser_ast2list,	1,
+	"Creates a list-tree representation of an AST."},
     {"compileast",	parser_compileast,	1,
 	"Compiles an AST object into a code object."},
     {"expr",		parser_expr,		1,
@@ -2460,8 +2570,10 @@ static PyMethodDef parser_functions[] =  {
 	"Determines if an AST object was created from a suite."},
     {"suite",		parser_suite,		1,
 	"Creates an AST object from a suite."},
+    {"sequence2ast",	parser_tuple2ast,	1,
+	"Creates an AST object from a tree representation."},
     {"tuple2ast",	parser_tuple2ast,	1,
-	"Creates an AST object from a tuple-tree representation."},
+	"Creates an AST object from a tree representation."},
 
     {0, 0, 0}
     };