cpython-lru_cache-weakref: Modules/parsermodule.c annotate

annotate Modules/parsermodule.c @ 68043:cd14782886ca 3.2

Merged revisions 88652 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88652 | antoine.pitrou | 2011-02-26 16:58:05 +0100 (sam., 26 févr. 2011) | 4 lines Issue #9931: Fix hangs in GUI tests under Windows in certain conditions. Patch by Hirokazu Yamamoto. ........

author	Antoine Pitrou <solipsis@pitrou.net>
date	Sat, 26 Feb 2011 16:49:08 +0000
parents	50d170bb71c7
children	3c9232a684ae

rev	line source
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1 /* parsermodule.c
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2 *
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	3 * Copyright 1995-1996 by Fred L. Drake, Jr. and Virginia Polytechnic
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	4 * Institute and State University, Blacksburg, Virginia, USA.
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	5 * Portions copyright 1991-1995 by Stichting Mathematisch Centrum,
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	6 * Amsterdam, The Netherlands. Copying is permitted under the terms
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	7 * associated with the main Python distribution, with the additional
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	8 * restriction that this additional notice be included and maintained
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	9 * on all distributed copies.
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	10 *
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	11 * This module serves to replace the original parser module written
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	12 * by Guido. The functionality is not matched precisely, but the
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	13 * original may be implemented on top of this. This is desirable
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	14 * since the source of the text to be parsed is now divorced from
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	15 * this interface.
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	16 *
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	17 * Unlike the prior interface, the ability to give a parse tree
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	18 * produced by Python code as a tuple to the compiler is enabled by
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	19 * this module. See the documentation for more details.
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	20 *
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	21 * I've added some annotations that help with the lint code-checking
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	22 * program, but they're not complete by a long shot. The real errors
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	23 * that lint detects are gone, but there are still warnings with
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	24 * Py_[X]DECREF() and Py_[X]INCREF() macros. The lint annotations
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	25 * look like "NOTE(...)".
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	26 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	27
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	28 #include "Python.h" /* general Python API */
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	29 #include "Python-ast.h" /* mod_ty */
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	30 #include "graminit.h" /* symbols defined in the grammar */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	31 #include "node.h" /* internal parser structure */
21237 42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	32 #include "errcode.h" /* error codes for PyNode_() /
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	33 #include "token.h" /* token definitions */
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	34 #include "grammar.h"
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	35 #include "parsetok.h"
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	36 /* ISTERMINAL() / ISNONTERMINAL() */
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	37 #undef Yield
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	38 #include "ast.h"
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	39
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	40 extern grammar _PyParser_Grammar; /* From graminit.c */
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	41
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	42 #ifdef lint
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	43 #include <note.h>
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	44 #else
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	45 #define NOTE(x)
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	46 #endif
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	47
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	48 /* String constants used to initialize module attributes.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	49 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	50 */
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23538 diff changeset	51 static char parser_copyright_string[] =
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23538 diff changeset	52 "Copyright 1995-1996 by Virginia Polytechnic Institute & State\n\
4099 3a3b36716689 Patches to make it compile with K&R C Guido van Rossum <guido@python.org> parents: 4092 diff changeset	53 University, Blacksburg, Virginia, USA, and Fred L. Drake, Jr., Reston,\n\
3a3b36716689 Patches to make it compile with K&R C Guido van Rossum <guido@python.org> parents: 4092 diff changeset	54 Virginia, USA. Portions copyright 1991-1995 by Stichting Mathematisch\n\
3a3b36716689 Patches to make it compile with K&R C Guido van Rossum <guido@python.org> parents: 4092 diff changeset	55 Centrum, Amsterdam, The Netherlands.";
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	56
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	57
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23538 diff changeset	58 PyDoc_STRVAR(parser_doc_string,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23538 diff changeset	59 "This is an interface to Python's internal parser.");
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23538 diff changeset	60
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23538 diff changeset	61 static char parser_version_string[] = "0.5";
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	62
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	63
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	64 typedef PyObject* (*SeqMaker) (Py_ssize_t length);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	65 typedef int (SeqInserter) (PyObject sequence,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	66 Py_ssize_t index,
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	67 PyObject* element);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	68
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	69 /* The function below is copyrighted by Stichting Mathematisch Centrum. The
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	70 * original copyright statement is included below, and continues to apply
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	71 * in full to the function immediately following. All other material is
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	72 * original, copyrighted by Fred L. Drake, Jr. and Virginia Polytechnic
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	73 * Institute and State University. Changes were made to comply with the
4099 3a3b36716689 Patches to make it compile with K&R C Guido van Rossum <guido@python.org> parents: 4092 diff changeset	74 * new naming conventions. Added arguments to provide support for creating
3a3b36716689 Patches to make it compile with K&R C Guido van Rossum <guido@python.org> parents: 4092 diff changeset	75 * lists as well as tuples, and optionally including the line numbers.
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	76 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	77
1406 474823e5f7dc * parsermodule.c, Makefile, config.c: rudimentary interface to the Python Guido van Rossum <guido@python.org> parents: diff changeset	78
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	79 static PyObject*
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	80 node2tuple(node n, / node to convert */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	81 SeqMaker mkseq, /* create sequence */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	82 SeqInserter addelem, /* func. to add elem. in seq. */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	83 int lineno, /* include line numbers? */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	84 int col_offset) /* include column offsets? */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	85 {
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	86 if (n == NULL) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	87 Py_INCREF(Py_None);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	88 return (Py_None);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	89 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	90 if (ISNONTERMINAL(TYPE(n))) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	91 int i;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	92 PyObject *v;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	93 PyObject *w;
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	94
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 24796 diff changeset	95 v = mkseq(1 + NCH(n) + (TYPE(n) == encoding_decl));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	96 if (v == NULL)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	97 return (v);
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43862 diff changeset	98 w = PyLong_FromLong(TYPE(n));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	99 if (w == NULL) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	100 Py_DECREF(v);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	101 return ((PyObject*) NULL);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	102 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	103 (void) addelem(v, 0, w);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	104 for (i = 0; i < NCH(n); i++) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	105 w = node2tuple(CHILD(n, i), mkseq, addelem, lineno, col_offset);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	106 if (w == NULL) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	107 Py_DECREF(v);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	108 return ((PyObject*) NULL);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	109 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	110 (void) addelem(v, i+1, w);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	111 }
29952 1cbc6b7836dc Merge 23c1-branch back into the head. Barry will send email about the Tim Peters <tim.peters@gmail.com> parents: 28551 diff changeset	112
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 24796 diff changeset	113 if (TYPE(n) == encoding_decl)
42856 f3b3ffd13954 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42535 diff changeset	114 (void) addelem(v, i+1, PyUnicode_FromString(STR(n)));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	115 return (v);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	116 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	117 else if (ISTERMINAL(TYPE(n))) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	118 PyObject *result = mkseq(2 + lineno + col_offset);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	119 if (result != NULL) {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43862 diff changeset	120 (void) addelem(result, 0, PyLong_FromLong(TYPE(n)));
42856 f3b3ffd13954 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42535 diff changeset	121 (void) addelem(result, 1, PyUnicode_FromString(STR(n)));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	122 if (lineno == 1)
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43862 diff changeset	123 (void) addelem(result, 2, PyLong_FromLong(n->n_lineno));
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	124 if (col_offset == 1)
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43862 diff changeset	125 (void) addelem(result, 3, PyLong_FromLong(n->n_col_offset));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	126 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	127 return (result);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	128 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	129 else {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	130 PyErr_SetString(PyExc_SystemError,
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	131 "unrecognized parse tree node type");
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	132 return ((PyObject*) NULL);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	133 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	134 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	135 /*
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	136 * End of material copyrighted by Stichting Mathematisch Centrum.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	137 */
1406 474823e5f7dc * parsermodule.c, Makefile, config.c: rudimentary interface to the Python Guido van Rossum <guido@python.org> parents: diff changeset	138
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	139
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	140
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	141 /* There are two types of intermediate objects we're interested in:
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	142 * 'eval' and 'exec' types. These constants can be used in the st_type
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	143 * field of the object type to identify which any given object represents.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	144 * These should probably go in an external header to allow other extensions
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	145 * to use them, but then, we really should be using C++ too. ;-)
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	146 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	147
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	148 #define PyST_EXPR 1
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	149 #define PyST_SUITE 2
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	150
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	151
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	152 /* These are the internal objects and definitions required to implement the
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	153 * ST type. Most of the internal names are more reminiscent of the 'old'
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	154 * naming style, but the code uses the new naming convention.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	155 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	156
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	157 static PyObject*
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	158 parser_error = 0;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	159
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	160
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	161 typedef struct {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	162 PyObject_HEAD /* standard object header */
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	163 node* st_node; /* the node* returned by the parser */
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	164 int st_type; /* EXPR or SUITE ? */
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	165 PyCompilerFlags st_flags; /* Parser and compiler flags */
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	166 } PyST_Object;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	167
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	168
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	169 static void parser_free(PyST_Object *st);
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	170 static PyObject* parser_richcompare(PyObject left, PyObject right, int op);
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	171 static PyObject* parser_compilest(PyST_Object , PyObject , PyObject *);
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	172 static PyObject* parser_isexpr(PyST_Object , PyObject , PyObject *);
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	173 static PyObject* parser_issuite(PyST_Object , PyObject , PyObject *);
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	174 static PyObject* parser_st2list(PyST_Object , PyObject , PyObject *);
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	175 static PyObject* parser_st2tuple(PyST_Object , PyObject , PyObject *);
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	176
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	177 #define PUBLIC_METHOD_TYPE (METH_VARARGS\|METH_KEYWORDS)
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	178
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	179 static PyMethodDef parser_methods[] = {
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	180 {"compile", (PyCFunction)parser_compilest, PUBLIC_METHOD_TYPE,
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	181 PyDoc_STR("Compile this ST object into a code object.")},
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	182 {"isexpr", (PyCFunction)parser_isexpr, PUBLIC_METHOD_TYPE,
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	183 PyDoc_STR("Determines if this ST object was created from an expression.")},
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	184 {"issuite", (PyCFunction)parser_issuite, PUBLIC_METHOD_TYPE,
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	185 PyDoc_STR("Determines if this ST object was created from a suite.")},
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	186 {"tolist", (PyCFunction)parser_st2list, PUBLIC_METHOD_TYPE,
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	187 PyDoc_STR("Creates a list-tree representation of this ST.")},
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	188 {"totuple", (PyCFunction)parser_st2tuple, PUBLIC_METHOD_TYPE,
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	189 PyDoc_STR("Creates a tuple-tree representation of this ST.")},
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	190
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	191 {NULL, NULL, 0, NULL}
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	192 };
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	193
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	194 static
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	195 PyTypeObject PyST_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41824 diff changeset	196 PyVarObject_HEAD_INIT(NULL, 0)
21313 91dd223829c6 Patch supplied by Burton Radons for his own SF bug #487390: Modifying Guido van Rossum <guido@python.org> parents: 21237 diff changeset	197 "parser.st", /* tp_name */
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	198 (int) sizeof(PyST_Object), /* tp_basicsize */
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	199 0, /* tp_itemsize */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	200 (destructor)parser_free, /* tp_dealloc */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	201 0, /* tp_print */
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	202 0, /* tp_getattr */
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	203 0, /* tp_setattr */
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51244 diff changeset	204 0, /* tp_reserved */
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	205 0, /* tp_repr */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	206 0, /* tp_as_number */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	207 0, /* tp_as_sequence */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	208 0, /* tp_as_mapping */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	209 0, /* tp_hash */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	210 0, /* tp_call */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	211 0, /* tp_str */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	212 0, /* tp_getattro */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	213 0, /* tp_setattro */
5613 190e35bbc15a Add doc string to type object. Fred Drake <fdrake@acm.org> parents: 5236 diff changeset	214
190e35bbc15a Add doc string to type object. Fred Drake <fdrake@acm.org> parents: 5236 diff changeset	215 /* Functions to access object as input/output buffer */
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	216 0, /* tp_as_buffer */
5613 190e35bbc15a Add doc string to type object. Fred Drake <fdrake@acm.org> parents: 5236 diff changeset	217
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	218 Py_TPFLAGS_DEFAULT, /* tp_flags */
5613 190e35bbc15a Add doc string to type object. Fred Drake <fdrake@acm.org> parents: 5236 diff changeset	219
190e35bbc15a Add doc string to type object. Fred Drake <fdrake@acm.org> parents: 5236 diff changeset	220 /* __doc__ */
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	221 "Intermediate representation of a Python parse tree.",
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	222 0, /* tp_traverse */
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	223 0, /* tp_clear */
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	224 parser_richcompare, /* tp_richcompare */
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	225 0, /* tp_weaklistoffset */
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	226 0, /* tp_iter */
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	227 0, /* tp_iternext */
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	228 parser_methods, /* tp_methods */
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	229 }; /* PyST_Type */
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	230
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	231
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	232 /* PyST_Type isn't subclassable, so just check ob_type */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	233 #define PyST_Object_Check(v) ((v)->ob_type == &PyST_Type)
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	234
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	235 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	236 parser_compare_nodes(node left, node right)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	237 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	238 int j;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	239
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	240 if (TYPE(left) < TYPE(right))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	241 return (-1);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	242
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	243 if (TYPE(right) < TYPE(left))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	244 return (1);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	245
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	246 if (ISTERMINAL(TYPE(left)))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	247 return (strcmp(STR(left), STR(right)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	248
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	249 if (NCH(left) < NCH(right))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	250 return (-1);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	251
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	252 if (NCH(right) < NCH(left))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	253 return (1);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	254
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	255 for (j = 0; j < NCH(left); ++j) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	256 int v = parser_compare_nodes(CHILD(left, j), CHILD(right, j));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	257
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	258 if (v != 0)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	259 return (v);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	260 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	261 return (0);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	262 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	263
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	264 /* parser_richcompare(PyObject* left, PyObject* right, int op)
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	265 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	266 * Comparison function used by the Python operators ==, !=, <, >, <=, >=
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	267 * This really just wraps a call to parser_compare_nodes() with some easy
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	268 * checks and protection code.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	269 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	270 */
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	271
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	272 #define TEST_COND(cond) ((cond) ? Py_True : Py_False)
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	273
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	274 static PyObject *
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	275 parser_richcompare(PyObject left, PyObject right, int op)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	276 {
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	277 int result;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	278 PyObject *v;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	279
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	280 /* neither argument should be NULL, unless something's gone wrong */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	281 if (left == NULL \|\| right == NULL) {
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	282 PyErr_BadInternalCall();
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	283 return NULL;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	284 }
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	285
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	286 /* both arguments should be instances of PyST_Object */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	287 if (!PyST_Object_Check(left) \|\| !PyST_Object_Check(right)) {
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	288 v = Py_NotImplemented;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	289 goto finished;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	290 }
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	291
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	292 if (left == right)
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	293 /* if arguments are identical, they're equal */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	294 result = 0;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	295 else
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	296 result = parser_compare_nodes(((PyST_Object *)left)->st_node,
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	297 ((PyST_Object *)right)->st_node);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	298
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	299 /* Convert return value to a Boolean */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	300 switch (op) {
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	301 case Py_EQ:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	302 v = TEST_COND(result == 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	303 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	304 case Py_NE:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	305 v = TEST_COND(result != 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	306 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	307 case Py_LE:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	308 v = TEST_COND(result <= 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	309 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	310 case Py_GE:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	311 v = TEST_COND(result >= 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	312 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	313 case Py_LT:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	314 v = TEST_COND(result < 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	315 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	316 case Py_GT:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	317 v = TEST_COND(result > 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	318 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	319 default:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	320 PyErr_BadArgument();
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	321 return NULL;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	322 }
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	323 finished:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	324 Py_INCREF(v);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	325 return v;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	326 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	327
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	328 /* parser_newstobject(node* st)
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	329 *
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	330 * Allocates a new Python object representing an ST. This is simply the
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	331 * 'wrapper' object that holds a node* and allows it to be passed around in
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	332 * Python code.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	333 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	334 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	335 static PyObject*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	336 parser_newstobject(node *st, int type)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	337 {
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	338 PyST_Object* o = PyObject_New(PyST_Object, &PyST_Type);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	339
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	340 if (o != 0) {
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	341 o->st_node = st;
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	342 o->st_type = type;
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	343 o->st_flags.cf_flags = 0;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	344 }
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	345 else {
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	346 PyNode_Free(st);
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	347 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	348 return ((PyObject*)o);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	349 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	350
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	351
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	352 /* void parser_free(PyST_Object* st)
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	353 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	354 * This is called by a del statement that reduces the reference count to 0.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	355 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	356 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	357 static void
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	358 parser_free(PyST_Object *st)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	359 {
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	360 PyNode_Free(st->st_node);
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	361 PyObject_Del(st);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	362 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	363
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	364
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	365 /* parser_st2tuple(PyObject* self, PyObject* args, PyObject* kw)
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	366 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	367 * This provides conversion from a node* to a tuple object that can be
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	368 * returned to the Python-level caller. The ST object is not modified.
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	369 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	370 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	371 static PyObject*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	372 parser_st2tuple(PyST_Object self, PyObject args, PyObject *kw)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	373 {
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	374 PyObject *line_option = 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	375 PyObject *col_option = 0;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	376 PyObject *res = 0;
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	377 int ok;
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	378
48558 fcbd9f4f095c Remove "ast" aliases from the parser module. Georg Brandl <georg@python.org> parents: 48413 diff changeset	379 static char *keywords[] = {"st", "line_info", "col_info", NULL};
11266 c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	380
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	381 if (self == NULL \|\| PyModule_Check(self)) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	382 ok = PyArg_ParseTupleAndKeywords(args, kw, "O!\|OO:st2tuple", keywords,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	383 &PyST_Type, &self, &line_option,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	384 &col_option);
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	385 }
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	386 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	387 ok = PyArg_ParseTupleAndKeywords(args, kw, "\|OO:totuple", &keywords[1],
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	388 &line_option, &col_option);
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	389 if (ok != 0) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	390 int lineno = 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	391 int col_offset = 0;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	392 if (line_option != NULL) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	393 lineno = (PyObject_IsTrue(line_option) != 0) ? 1 : 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	394 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	395 if (col_option != NULL) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	396 col_offset = (PyObject_IsTrue(col_option) != 0) ? 1 : 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	397 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	398 /*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	399 * Convert ST into a tuple representation. Use Guido's function,
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	400 * since it's known to work already.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	401 */
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	402 res = node2tuple(((PyST_Object*)self)->st_node,
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	403 PyTuple_New, PyTuple_SetItem, lineno, col_offset);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	404 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	405 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	406 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	407
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	408
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	409 /* parser_st2list(PyObject* self, PyObject* args, PyObject* kw)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	410 *
11297 2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	411 * This provides conversion from a node* to a list object that can be
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	412 * returned to the Python-level caller. The ST object is not modified.
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	413 *
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	414 */
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	415 static PyObject*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	416 parser_st2list(PyST_Object self, PyObject args, PyObject *kw)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	417 {
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	418 PyObject *line_option = 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	419 PyObject *col_option = 0;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	420 PyObject *res = 0;
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	421 int ok;
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	422
48558 fcbd9f4f095c Remove "ast" aliases from the parser module. Georg Brandl <georg@python.org> parents: 48413 diff changeset	423 static char *keywords[] = {"st", "line_info", "col_info", NULL};
11266 c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	424
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	425 if (self == NULL \|\| PyModule_Check(self))
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	426 ok = PyArg_ParseTupleAndKeywords(args, kw, "O!\|OO:st2list", keywords,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	427 &PyST_Type, &self, &line_option,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	428 &col_option);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	429 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	430 ok = PyArg_ParseTupleAndKeywords(args, kw, "\|OO:tolist", &keywords[1],
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	431 &line_option, &col_option);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	432 if (ok) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	433 int lineno = 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	434 int col_offset = 0;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	435 if (line_option != 0) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	436 lineno = PyObject_IsTrue(line_option) ? 1 : 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	437 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	438 if (col_option != NULL) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	439 col_offset = (PyObject_IsTrue(col_option) != 0) ? 1 : 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	440 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	441 /*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	442 * Convert ST into a tuple representation. Use Guido's function,
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	443 * since it's known to work already.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	444 */
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	445 res = node2tuple(self->st_node,
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	446 PyList_New, PyList_SetItem, lineno, col_offset);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	447 }
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	448 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	449 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	450
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	451
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	452 /* parser_compilest(PyObject* self, PyObject* args)
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	453 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	454 * This function creates code objects from the parse tree represented by
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	455 * the passed-in data object. An optional file name is passed in as well.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	456 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	457 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	458 static PyObject*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	459 parser_compilest(PyST_Object self, PyObject args, PyObject *kw)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	460 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	461 PyObject* res = 0;
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	462 PyArena* arena;
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	463 mod_ty mod;
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	464 char* str = "<syntax-tree>";
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	465 int ok;
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	466
48558 fcbd9f4f095c Remove "ast" aliases from the parser module. Georg Brandl <georg@python.org> parents: 48413 diff changeset	467 static char *keywords[] = {"st", "filename", NULL};
11266 c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	468
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	469 if (self == NULL \|\| PyModule_Check(self))
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	470 ok = PyArg_ParseTupleAndKeywords(args, kw, "O!\|s:compilest", keywords,
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	471 &PyST_Type, &self, &str);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	472 else
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	473 ok = PyArg_ParseTupleAndKeywords(args, kw, "\|s:compile", &keywords[1],
11266 c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	474 &str);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	475
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	476 if (ok) {
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	477 arena = PyArena_New();
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	478 if (arena) {
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	479 mod = PyAST_FromNode(self->st_node, &(self->st_flags), str, arena);
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	480 if (mod) {
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	481 res = (PyObject *)PyAST_Compile(mod, str, &(self->st_flags), arena);
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	482 }
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	483 PyArena_Free(arena);
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	484 }
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	485 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	486
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	487 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	488 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	489
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	490
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	491 /* PyObject* parser_isexpr(PyObject* self, PyObject* args)
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	492 * PyObject* parser_issuite(PyObject* self, PyObject* args)
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	493 *
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	494 * Checks the passed-in ST object to determine if it is an expression or
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	495 * a statement suite, respectively. The return is a Python truth value.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	496 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	497 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	498 static PyObject*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	499 parser_isexpr(PyST_Object self, PyObject args, PyObject *kw)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	500 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	501 PyObject* res = 0;
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	502 int ok;
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	503
48558 fcbd9f4f095c Remove "ast" aliases from the parser module. Georg Brandl <georg@python.org> parents: 48413 diff changeset	504 static char *keywords[] = {"st", NULL};
11266 c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	505
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	506 if (self == NULL \|\| PyModule_Check(self))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	507 ok = PyArg_ParseTupleAndKeywords(args, kw, "O!:isexpr", keywords,
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	508 &PyST_Type, &self);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	509 else
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	510 ok = PyArg_ParseTupleAndKeywords(args, kw, ":isexpr", &keywords[1]);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	511
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	512 if (ok) {
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	513 /* Check to see if the ST represents an expression or not. */
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	514 res = (self->st_type == PyST_EXPR) ? Py_True : Py_False;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	515 Py_INCREF(res);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	516 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	517 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	518 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	519
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	520
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	521 static PyObject*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	522 parser_issuite(PyST_Object self, PyObject args, PyObject *kw)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	523 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	524 PyObject* res = 0;
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	525 int ok;
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	526
48558 fcbd9f4f095c Remove "ast" aliases from the parser module. Georg Brandl <georg@python.org> parents: 48413 diff changeset	527 static char *keywords[] = {"st", NULL};
11266 c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	528
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	529 if (self == NULL \|\| PyModule_Check(self))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	530 ok = PyArg_ParseTupleAndKeywords(args, kw, "O!:issuite", keywords,
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	531 &PyST_Type, &self);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	532 else
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	533 ok = PyArg_ParseTupleAndKeywords(args, kw, ":issuite", &keywords[1]);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	534
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	535 if (ok) {
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	536 /* Check to see if the ST represents an expression or not. */
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	537 res = (self->st_type == PyST_EXPR) ? Py_False : Py_True;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	538 Py_INCREF(res);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	539 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	540 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	541 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	542
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	543
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	544 /* err_string(char* message)
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	545 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	546 * Sets the error string for an exception of type ParserError.
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	547 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	548 */
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	549 static void
13503 6484098f40fc ANSI-fying Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13466 diff changeset	550 err_string(char *message)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	551 {
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	552 PyErr_SetString(parser_error, message);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	553 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	554
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	555
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	556 /* PyObject* parser_do_parse(PyObject* args, int type)
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	557 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	558 * Internal function to actually execute the parse and return the result if
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 24796 diff changeset	559 * successful or set an exception if not.
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	560 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	561 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	562 static PyObject*
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	563 parser_do_parse(PyObject args, PyObject kw, char *argspec, int type)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	564 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	565 char* string = 0;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	566 PyObject* res = 0;
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	567 int flags = 0;
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	568 perrdetail err;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	569
36680 54eb5b1fb363 unconst. Martin v. Löwis <martin@v.loewis.de> parents: 36673 diff changeset	570 static char *keywords[] = {"source", NULL};
11266 c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	571
c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	572 if (PyArg_ParseTupleAndKeywords(args, kw, argspec, keywords, &string)) {
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	573 node* n = PyParser_ParseStringFlagsFilenameEx(string, NULL,
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	574 &_PyParser_Grammar,
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	575 (type == PyST_EXPR)
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	576 ? eval_input : file_input,
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	577 &err, &flags);
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	578
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	579 if (n) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	580 res = parser_newstobject(n, type);
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	581 if (res)
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	582 ((PyST_Object *)res)->st_flags.cf_flags = flags & PyCF_MASK;
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	583 }
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	584 else
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	585 PyParser_SetError(&err);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	586 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	587 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	588 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	589
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	590
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	591 /* PyObject* parser_expr(PyObject* self, PyObject* args)
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	592 * PyObject* parser_suite(PyObject* self, PyObject* args)
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	593 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	594 * External interfaces to the parser itself. Which is called determines if
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	595 * the parser attempts to recognize an expression ('eval' form) or statement
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	596 * suite ('exec' form). The real work is done by parser_do_parse() above.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	597 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	598 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	599 static PyObject*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	600 parser_expr(PyST_Object self, PyObject args, PyObject *kw)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	601 {
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	602 NOTE(ARGUNUSED(self))
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	603 return (parser_do_parse(args, kw, "s:expr", PyST_EXPR));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	604 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	605
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	606
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	607 static PyObject*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	608 parser_suite(PyST_Object self, PyObject args, PyObject *kw)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	609 {
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	610 NOTE(ARGUNUSED(self))
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	611 return (parser_do_parse(args, kw, "s:suite", PyST_SUITE));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	612 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	613
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	614
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	615
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	616 /* This is the messy part of the code. Conversion from a tuple to an ST
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	617 * object requires that the input tuple be valid without having to rely on
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	618 * catching an exception from the compiler. This is done to allow the
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	619 * compiler itself to remain fast, since most of its input will come from
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	620 * the parser directly, and therefore be known to be syntactically correct.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	621 * This validation is done to ensure that we don't core dump the compile
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	622 * phase, returning an exception instead.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	623 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	624 * Two aspects can be broken out in this code: creating a node tree from
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	625 * the tuple passed in, and verifying that it is indeed valid. It may be
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	626 * advantageous to expand the number of ST types to include funcdefs and
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	627 * lambdadefs to take advantage of the optimizer, recognizing those STs
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	628 * here. They are not necessary, and not quite as useful in a raw form.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	629 * For now, let's get expressions and suites working reliably.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	630 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	631
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	632
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	633 static node* build_node_tree(PyObject *tuple);
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	634 static int validate_expr_tree(node *tree);
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	635 static int validate_file_input(node *tree);
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	636 static int validate_encoding_decl(node *tree);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	637
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	638 /* PyObject* parser_tuple2st(PyObject* self, PyObject* args)
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	639 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	640 * This is the public function, called from the Python code. It receives a
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	641 * single tuple object from the caller, and creates an ST object if the
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	642 * tuple can be validated. It does this by checking the first code of the
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	643 * tuple, and, if acceptable, builds the internal representation. If this
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	644 * step succeeds, the internal representation is validated as fully as
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	645 * possible with the various validate_*() routines defined below.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	646 *
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	647 * This function must be changed if support is to be added for PyST_FRAGMENT
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	648 * ST objects.
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	649 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	650 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	651 static PyObject*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	652 parser_tuple2st(PyST_Object self, PyObject args, PyObject *kw)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	653 {
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	654 NOTE(ARGUNUSED(self))
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	655 PyObject *st = 0;
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	656 PyObject *tuple;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	657 node *tree;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	658
36680 54eb5b1fb363 unconst. Martin v. Löwis <martin@v.loewis.de> parents: 36673 diff changeset	659 static char *keywords[] = {"sequence", NULL};
11266 c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	660
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	661 if (!PyArg_ParseTupleAndKeywords(args, kw, "O:sequence2st", keywords,
11266 c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	662 &tuple))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	663 return (0);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	664 if (!PySequence_Check(tuple)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	665 PyErr_SetString(PyExc_ValueError,
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	666 "sequence2st() requires a single sequence argument");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	667 return (0);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	668 }
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	669 /*
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	670 * Convert the tree to the internal form before checking it.
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	671 */
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	672 tree = build_node_tree(tuple);
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	673 if (tree != 0) {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	674 int start_sym = TYPE(tree);
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	675 if (start_sym == eval_input) {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	676 /* Might be an eval form. */
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	677 if (validate_expr_tree(tree))
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	678 st = parser_newstobject(tree, PyST_EXPR);
21237 42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	679 else
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	680 PyNode_Free(tree);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	681 }
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	682 else if (start_sym == file_input) {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	683 /* This looks like an exec form so far. */
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	684 if (validate_file_input(tree))
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	685 st = parser_newstobject(tree, PyST_SUITE);
21237 42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	686 else
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	687 PyNode_Free(tree);
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	688 }
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	689 else if (start_sym == encoding_decl) {
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	690 /* This looks like an encoding_decl so far. */
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	691 if (validate_encoding_decl(tree))
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	692 st = parser_newstobject(tree, PyST_SUITE);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	693 else
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	694 PyNode_Free(tree);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	695 }
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	696 else {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	697 /* This is a fragment, at best. */
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	698 PyNode_Free(tree);
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	699 err_string("parse tree does not use a valid start symbol");
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	700 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	701 }
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	702 /* Make sure we throw an exception on all errors. We should never
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	703 * get this, but we'd do well to be sure something is done.
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	704 */
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	705 if (st == NULL && !PyErr_Occurred())
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	706 err_string("unspecified ST error occurred");
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	707
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	708 return st;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	709 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	710
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	711
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	712 /* node* build_node_children()
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	713 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	714 * Iterate across the children of the current non-terminal node and build
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	715 * their structures. If successful, return the root of this portion of
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	716 * the tree, otherwise, 0. Any required exception will be specified already,
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	717 * and no memory will have been deallocated.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	718 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	719 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	720 static node*
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	721 build_node_children(PyObject tuple, node root, int *line_num)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	722 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	723 Py_ssize_t len = PyObject_Size(tuple);
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	724 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	725 int err;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	726
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	727 for (i = 1; i < len; ++i) {
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	728 /* elem must always be a sequence, however simple */
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	729 PyObject* elem = PySequence_GetItem(tuple, i);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	730 int ok = elem != NULL;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	731 long type = 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	732 char *strn = 0;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	733
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	734 if (ok)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	735 ok = PySequence_Check(elem);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	736 if (ok) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	737 PyObject *temp = PySequence_GetItem(elem, 0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	738 if (temp == NULL)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	739 ok = 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	740 else {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43862 diff changeset	741 ok = PyLong_Check(temp);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	742 if (ok)
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43862 diff changeset	743 type = PyLong_AS_LONG(temp);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	744 Py_DECREF(temp);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	745 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	746 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	747 if (!ok) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	748 PyObject *err = Py_BuildValue("os", elem,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	749 "Illegal node construct.");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	750 PyErr_SetObject(parser_error, err);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	751 Py_XDECREF(err);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	752 Py_XDECREF(elem);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	753 return (0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	754 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	755 if (ISTERMINAL(type)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	756 Py_ssize_t len = PyObject_Size(elem);
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	757 PyObject *temp;
42856 f3b3ffd13954 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42535 diff changeset	758 const char *temp_str;
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	759
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	760 if ((len != 2) && (len != 3)) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	761 err_string("terminal nodes must have 2 or 3 entries");
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	762 return 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	763 }
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	764 temp = PySequence_GetItem(elem, 1);
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	765 if (temp == NULL)
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	766 return 0;
42856 f3b3ffd13954 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42535 diff changeset	767 if (!PyUnicode_Check(temp)) {
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	768 PyErr_Format(parser_error,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	769 "second item in terminal node must be a string,"
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	770 " found %s",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	771 Py_TYPE(temp)->tp_name);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12487 diff changeset	772 Py_DECREF(temp);
42535 8d6867cb8a8d Fix refleaks Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	773 Py_DECREF(elem);
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	774 return 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	775 }
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	776 if (len == 3) {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	777 PyObject *o = PySequence_GetItem(elem, 2);
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	778 if (o != NULL) {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43862 diff changeset	779 if (PyLong_Check(o))
f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43862 diff changeset	780 *line_num = PyLong_AS_LONG(o);
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	781 else {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	782 PyErr_Format(parser_error,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	783 "third item in terminal node must be an"
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	784 " integer, found %s",
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	785 Py_TYPE(temp)->tp_name);
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	786 Py_DECREF(o);
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	787 Py_DECREF(temp);
42535 8d6867cb8a8d Fix refleaks Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	788 Py_DECREF(elem);
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	789 return 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	790 }
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	791 Py_DECREF(o);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	792 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	793 }
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48558 diff changeset	794 temp_str = _PyUnicode_AsStringAndSize(temp, &len);
66799 50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	795 if (temp_str == NULL) {
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	796 Py_DECREF(temp);
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	797 Py_XDECREF(elem);
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	798 return 0;
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	799 }
46644 ea594306ea85 Issue #1950: Fixed misusage of PyUnicode_AsString(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44441 diff changeset	800 strn = (char *)PyObject_MALLOC(len + 1);
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	801 if (strn != NULL)
46644 ea594306ea85 Issue #1950: Fixed misusage of PyUnicode_AsString(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44441 diff changeset	802 (void) memcpy(strn, temp_str, len + 1);
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	803 Py_DECREF(temp);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	804 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	805 else if (!ISNONTERMINAL(type)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	806 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	807 * It has to be one or the other; this is an error.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	808 * Throw an exception.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	809 */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	810 PyObject *err = Py_BuildValue("os", elem, "unknown node type.");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	811 PyErr_SetObject(parser_error, err);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	812 Py_XDECREF(err);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	813 Py_XDECREF(elem);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	814 return (0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	815 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36712 diff changeset	816 err = PyNode_AddChild(root, type, strn, *line_num, 0);
21237 42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	817 if (err == E_NOMEM) {
42535 8d6867cb8a8d Fix refleaks Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	818 Py_XDECREF(elem);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	819 PyObject_FREE(strn);
21237 42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	820 return (node *) PyErr_NoMemory();
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	821 }
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	822 if (err == E_OVERFLOW) {
42535 8d6867cb8a8d Fix refleaks Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	823 Py_XDECREF(elem);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	824 PyObject_FREE(strn);
21237 42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	825 PyErr_SetString(PyExc_ValueError,
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	826 "unsupported number of child nodes");
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	827 return NULL;
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	828 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	829
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	830 if (ISNONTERMINAL(type)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	831 node* new_child = CHILD(root, i - 1);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	832
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	833 if (new_child != build_node_children(elem, new_child, line_num)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	834 Py_XDECREF(elem);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	835 return (0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	836 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	837 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	838 else if (type == NEWLINE) { /* It's true: we increment the */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	839 ++(line_num); / line number after the newline! */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	840 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	841 Py_XDECREF(elem);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	842 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	843 return root;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	844 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	845
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	846
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	847 static node*
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	848 build_node_tree(PyObject *tuple)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	849 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	850 node* res = 0;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	851 PyObject *temp = PySequence_GetItem(tuple, 0);
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	852 long num = -1;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	853
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	854 if (temp != NULL)
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43862 diff changeset	855 num = PyLong_AsLong(temp);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	856 Py_XDECREF(temp);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	857 if (ISTERMINAL(num)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	858 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	859 * The tuple is simple, but it doesn't start with a start symbol.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	860 * Throw an exception now and be done with it.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	861 */
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	862 tuple = Py_BuildValue("os", tuple,
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	863 "Illegal syntax-tree; cannot start with terminal symbol.");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	864 PyErr_SetObject(parser_error, tuple);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	865 Py_XDECREF(tuple);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	866 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	867 else if (ISNONTERMINAL(num)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	868 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	869 * Not efficient, but that can be handled later.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	870 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	871 int line_num = 0;
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	872 PyObject *encoding = NULL;
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	873
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	874 if (num == encoding_decl) {
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	875 encoding = PySequence_GetItem(tuple, 2);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	876 /* tuple isn't borrowed anymore here, need to DECREF */
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	877 tuple = PySequence_GetSlice(tuple, 0, 2);
66799 50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	878 if (tuple == NULL)
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	879 return NULL;
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	880 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	881 res = PyNode_New(num);
21237 42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	882 if (res != NULL) {
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	883 if (res != build_node_children(tuple, res, &line_num)) {
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	884 PyNode_Free(res);
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	885 res = NULL;
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	886 }
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	887 if (res && encoding) {
36518 9f3f87e920a6 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	888 Py_ssize_t len;
42856 f3b3ffd13954 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42535 diff changeset	889 const char *temp;
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48558 diff changeset	890 temp = _PyUnicode_AsStringAndSize(encoding, &len);
66799 50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	891 if (temp == NULL) {
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	892 Py_DECREF(res);
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	893 Py_DECREF(encoding);
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	894 Py_DECREF(tuple);
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	895 return NULL;
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66556 diff changeset	896 }
46644 ea594306ea85 Issue #1950: Fixed misusage of PyUnicode_AsString(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44441 diff changeset	897 res->n_str = (char *)PyObject_MALLOC(len + 1);
42856 f3b3ffd13954 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42535 diff changeset	898 if (res->n_str != NULL && temp != NULL)
46644 ea594306ea85 Issue #1950: Fixed misusage of PyUnicode_AsString(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44441 diff changeset	899 (void) memcpy(res->n_str, temp, len + 1);
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	900 Py_DECREF(encoding);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	901 Py_DECREF(tuple);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	902 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	903 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	904 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	905 else {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	906 /* The tuple is illegal -- if the number is neither TERMINAL nor
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	907 * NONTERMINAL, we can't use it. Not sure the implementation
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	908 * allows this condition, but the API doesn't preclude it.
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	909 */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	910 PyObject *err = Py_BuildValue("os", tuple,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	911 "Illegal component tuple.");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	912 PyErr_SetObject(parser_error, err);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	913 Py_XDECREF(err);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36786 diff changeset	914 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	915
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	916 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	917 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	918
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	919
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	920 /*
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	921 * Validation routines used within the validation section:
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	922 */
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	923 static int validate_terminal(node terminal, int type, char string);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	924
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	925 #define validate_ampersand(ch) validate_terminal(ch, AMPER, "&")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	926 #define validate_circumflex(ch) validate_terminal(ch, CIRCUMFLEX, "^")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	927 #define validate_colon(ch) validate_terminal(ch, COLON, ":")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	928 #define validate_comma(ch) validate_terminal(ch, COMMA, ",")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	929 #define validate_dedent(ch) validate_terminal(ch, DEDENT, "")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	930 #define validate_equal(ch) validate_terminal(ch, EQUAL, "=")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	931 #define validate_indent(ch) validate_terminal(ch, INDENT, (char*)NULL)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	932 #define validate_lparen(ch) validate_terminal(ch, LPAR, "(")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	933 #define validate_newline(ch) validate_terminal(ch, NEWLINE, (char*)NULL)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	934 #define validate_rparen(ch) validate_terminal(ch, RPAR, ")")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	935 #define validate_semi(ch) validate_terminal(ch, SEMI, ";")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	936 #define validate_star(ch) validate_terminal(ch, STAR, "*")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	937 #define validate_vbar(ch) validate_terminal(ch, VBAR, "\|")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	938 #define validate_doublestar(ch) validate_terminal(ch, DOUBLESTAR, "**")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	939 #define validate_dot(ch) validate_terminal(ch, DOT, ".")
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	940 #define validate_at(ch) validate_terminal(ch, AT, "@")
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	941 #define validate_name(ch, str) validate_terminal(ch, NAME, str)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	942
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	943 #define VALIDATER(n) static int validate_##n(node *tree)
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	944
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	945 VALIDATER(node); VALIDATER(small_stmt);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	946 VALIDATER(class); VALIDATER(node);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	947 VALIDATER(parameters); VALIDATER(suite);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	948 VALIDATER(testlist); VALIDATER(varargslist);
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	949 VALIDATER(vfpdef);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	950 VALIDATER(stmt); VALIDATER(simple_stmt);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	951 VALIDATER(expr_stmt); VALIDATER(power);
40774 793e0323d4d6 Essential changes for print function changes. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	952 VALIDATER(del_stmt);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	953 VALIDATER(return_stmt); VALIDATER(raise_stmt);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	954 VALIDATER(import_stmt); VALIDATER(import_stmt);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	955 VALIDATER(import_name); VALIDATER(yield_stmt);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	956 VALIDATER(global_stmt); VALIDATER(assert_stmt);
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	957 VALIDATER(compound_stmt); VALIDATER(test_or_star_expr);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	958 VALIDATER(while); VALIDATER(for);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	959 VALIDATER(try); VALIDATER(except_clause);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	960 VALIDATER(test); VALIDATER(and_test);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	961 VALIDATER(not_test); VALIDATER(comparison);
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	962 VALIDATER(comp_op);
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	963 VALIDATER(star_expr); VALIDATER(expr);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	964 VALIDATER(xor_expr); VALIDATER(and_expr);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	965 VALIDATER(shift_expr); VALIDATER(arith_expr);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	966 VALIDATER(term); VALIDATER(factor);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	967 VALIDATER(atom); VALIDATER(lambdef);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	968 VALIDATER(trailer); VALIDATER(subscript);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	969 VALIDATER(subscriptlist); VALIDATER(sliceop);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	970 VALIDATER(exprlist); VALIDATER(dictorsetmaker);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	971 VALIDATER(arglist); VALIDATER(argument);
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	972 VALIDATER(comp_for);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	973 VALIDATER(comp_iter); VALIDATER(comp_if);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	974 VALIDATER(testlist_comp); VALIDATER(yield_expr);
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	975 VALIDATER(or_test);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	976 VALIDATER(test_nocond); VALIDATER(lambdef_nocond);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	977
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	978 #undef VALIDATER
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	979
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	980 #define is_even(n) (((n) & 1) == 0)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	981 #define is_odd(n) (((n) & 1) == 1)
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	982
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	983
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	984 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	985 validate_ntype(node *n, int t)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	986 {
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	987 if (TYPE(n) != t) {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	988 PyErr_Format(parser_error, "Expected node type %d, got %d.",
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	989 t, TYPE(n));
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	990 return 0;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	991 }
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	992 return 1;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	993 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	994
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	995
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	996 /* Verifies that the number of child nodes is exactly 'num', raising
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	997 * an exception if it isn't. The exception message does not indicate
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	998 * the exact number of nodes, allowing this to be used to raise the
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	999 * "right" exception when the wrong number of nodes is present in a
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	1000 * specific variant of a statement's syntax. This is commonly used
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	1001 * in that fashion.
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	1002 */
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1003 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1004 validate_numnodes(node n, int num, const char const name)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1005 {
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1006 if (NCH(n) != num) {
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1007 PyErr_Format(parser_error,
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1008 "Illegal number of children for %s node.", name);
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1009 return 0;
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1010 }
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1011 return 1;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1012 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1013
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1014
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1015 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1016 validate_terminal(node terminal, int type, char string)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1017 {
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1018 int res = (validate_ntype(terminal, type)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1019 && ((string == 0) \|\| (strcmp(string, STR(terminal)) == 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1020
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1021 if (!res && !PyErr_Occurred()) {
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1022 PyErr_Format(parser_error,
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1023 "Illegal terminal: expected \"%s\"", string);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1024 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1025 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1026 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1027
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1028
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1029 /* X (',' X) [',']
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1030 */
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1031 static int
13667 a6c7bfdd6777 Even more ANSIfication: fix as many function pointers and declarations as Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1032 validate_repeating_list(node tree, int ntype, int (vfunc)(node *),
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1033 const char *const name)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1034 {
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1035 int nch = NCH(tree);
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1036 int res = (nch && validate_ntype(tree, ntype)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1037 && vfunc(CHILD(tree, 0)));
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1038
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1039 if (!res && !PyErr_Occurred())
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1040 (void) validate_numnodes(tree, 1, name);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1041 else {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1042 if (is_even(nch))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1043 res = validate_comma(CHILD(tree, --nch));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1044 if (res && nch > 1) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1045 int pos = 1;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1046 for ( ; res && pos < nch; pos += 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1047 res = (validate_comma(CHILD(tree, pos))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1048 && vfunc(CHILD(tree, pos + 1)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1049 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1050 }
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1051 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1052 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1053
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1054
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1055 /* validate_class()
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1056 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1057 * classdef:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1058 * 'class' NAME ['(' testlist ')'] ':' suite
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1059 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1060 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1061 validate_class(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1062 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1063 int nch = NCH(tree);
34887 7c2780c9e51b Flush out support for ``class B(): pass`` syntax by adding support to the Brett Cannon <bcannon@gmail.com> parents: 33353 diff changeset	1064 int res = (validate_ntype(tree, classdef) &&
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1065 ((nch == 4) \|\| (nch == 6) \|\| (nch == 7)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1066
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1067 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1068 res = (validate_name(CHILD(tree, 0), "class")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1069 && validate_ntype(CHILD(tree, 1), NAME)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1070 && validate_colon(CHILD(tree, nch - 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1071 && validate_suite(CHILD(tree, nch - 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1072 }
34887 7c2780c9e51b Flush out support for ``class B(): pass`` syntax by adding support to the Brett Cannon <bcannon@gmail.com> parents: 33353 diff changeset	1073 else {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1074 (void) validate_numnodes(tree, 4, "class");
34887 7c2780c9e51b Flush out support for ``class B(): pass`` syntax by adding support to the Brett Cannon <bcannon@gmail.com> parents: 33353 diff changeset	1075 }
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	1076
34887 7c2780c9e51b Flush out support for ``class B(): pass`` syntax by adding support to the Brett Cannon <bcannon@gmail.com> parents: 33353 diff changeset	1077 if (res) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1078 if (nch == 7) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1079 res = ((validate_lparen(CHILD(tree, 2)) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1080 validate_arglist(CHILD(tree, 3)) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1081 validate_rparen(CHILD(tree, 4))));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1082 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1083 else if (nch == 6) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1084 res = (validate_lparen(CHILD(tree,2)) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1085 validate_rparen(CHILD(tree,3)));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1086 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1087 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1088 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1089 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1090
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1091
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1092 /* if_stmt:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1093 * 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1094 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1095 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1096 validate_if(node *tree)
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1097 {
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1098 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1099 int res = (validate_ntype(tree, if_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1100 && (nch >= 4)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1101 && validate_name(CHILD(tree, 0), "if")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1102 && validate_test(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1103 && validate_colon(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1104 && validate_suite(CHILD(tree, 3)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1105
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1106 if (res && ((nch % 4) == 3)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1107 /* ... 'else' ':' suite */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1108 res = (validate_name(CHILD(tree, nch - 3), "else")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1109 && validate_colon(CHILD(tree, nch - 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1110 && validate_suite(CHILD(tree, nch - 1)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1111 nch -= 3;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1112 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1113 else if (!res && !PyErr_Occurred())
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1114 (void) validate_numnodes(tree, 4, "if");
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1115 if ((nch % 4) != 0)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1116 /* Will catch the case for nch < 4 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1117 res = validate_numnodes(tree, 0, "if");
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1118 else if (res && (nch > 4)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1119 /* ... ('elif' test ':' suite)+ ... */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1120 int j = 4;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1121 while ((j < nch) && res) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1122 res = (validate_name(CHILD(tree, j), "elif")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1123 && validate_colon(CHILD(tree, j + 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1124 && validate_test(CHILD(tree, j + 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1125 && validate_suite(CHILD(tree, j + 3)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1126 j += 4;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1127 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1128 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1129 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1130 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1131
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1132
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1133 /* parameters:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1134 * '(' [varargslist] ')'
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1135 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1136 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1137 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1138 validate_parameters(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1139 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1140 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1141 int res = validate_ntype(tree, parameters) && ((nch == 2) \|\| (nch == 3));
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1142
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1143 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1144 res = (validate_lparen(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1145 && validate_rparen(CHILD(tree, nch - 1)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1146 if (res && (nch == 3))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1147 res = validate_varargslist(CHILD(tree, 1));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1148 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1149 else {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1150 (void) validate_numnodes(tree, 2, "parameters");
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1151 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1152 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1153 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1154
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1155
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1156 /* validate_suite()
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1157 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1158 * suite:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1159 * simple_stmt
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1160 * \| NEWLINE INDENT stmt+ DEDENT
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1161 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1162 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1163 validate_suite(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1164 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1165 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1166 int res = (validate_ntype(tree, suite) && ((nch == 1) \|\| (nch >= 4)));
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1167
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1168 if (res && (nch == 1))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1169 res = validate_simple_stmt(CHILD(tree, 0));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1170 else if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1171 /* NEWLINE INDENT stmt+ DEDENT */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1172 res = (validate_newline(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1173 && validate_indent(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1174 && validate_stmt(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1175 && validate_dedent(CHILD(tree, nch - 1)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1176
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1177 if (res && (nch > 4)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1178 int i = 3;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1179 --nch; /* forget the DEDENT */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1180 for ( ; res && (i < nch); ++i)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1181 res = validate_stmt(CHILD(tree, i));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1182 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1183 else if (nch < 4)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1184 res = validate_numnodes(tree, 4, "suite");
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1185 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1186 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1187 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1188
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1189
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1190 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1191 validate_testlist(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1192 {
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1193 return (validate_repeating_list(tree, testlist,
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1194 validate_test, "testlist"));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1195 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1196
20432 56141b86a7f2 Very subtle syntax change: in a list comprehension, the testlist in Guido van Rossum <guido@python.org> parents: 19274 diff changeset	1197 static int
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1198 validate_testlist_star_expr(node *tl)
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	1199 {
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1200 return (validate_repeating_list(tl, testlist_star_expr, validate_test_or_star_expr,
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1201 "testlist"));
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	1202 }
9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	1203
9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	1204
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1205 /* validate either vfpdef or tfpdef.
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1206 * vfpdef: NAME
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1207 * tfpdef: NAME [':' test]
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1208 */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1209 static int
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1210 validate_vfpdef(node *tree)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1211 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1212 int nch = NCH(tree);
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1213 if (TYPE(tree) == vfpdef) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1214 return nch == 1 && validate_name(CHILD(tree, 0), NULL);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1215 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1216 else if (TYPE(tree) == tfpdef) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1217 if (nch == 1) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1218 return validate_name(CHILD(tree, 0), NULL);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1219 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1220 else if (nch == 3) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1221 return validate_name(CHILD(tree, 0), NULL) &&
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1222 validate_colon(CHILD(tree, 1)) &&
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1223 validate_test(CHILD(tree, 2));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1224 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1225 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1226 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1227 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1228
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1229 /* '' vfpdef (',' vfpdef ['=' test]) [',' '' vfpdef] \| '' vfpdef
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1230 * ..or tfpdef in place of vfpdef. vfpdef: NAME; tfpdef: NAME [':' test]
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1231 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1232 static int
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1233 validate_varargslist_trailer(node *tree, int start)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1234 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1235 int nch = NCH(tree);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1236 int res = 0, i;
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1237 int sym;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1238
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1239 if (nch <= start) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1240 err_string("expected variable argument trailer for varargslist");
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1241 return 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1242 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1243 sym = TYPE(CHILD(tree, start));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1244 if (sym == STAR) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1245 /*
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1246 * '' vfpdef (',' vfpdef ['=' test]) [',' '' vfpdef] \| '' vfpdef
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1247 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1248 if (nch-start == 2)
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1249 res = validate_vfpdef(CHILD(tree, start+1));
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1250 else if (nch-start == 5 && TYPE(CHILD(tree, start+2)) == COMMA)
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1251 res = (validate_vfpdef(CHILD(tree, start+1))
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1252 && validate_comma(CHILD(tree, start+2))
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1253 && validate_doublestar(CHILD(tree, start+3))
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1254 && validate_vfpdef(CHILD(tree, start+4)));
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1255 else {
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1256 /* skip over vfpdef (',' vfpdef ['=' test])* */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1257 i = start + 1;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1258 if (TYPE(CHILD(tree, i)) == vfpdef \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1259 TYPE(CHILD(tree, i)) == tfpdef) { /* skip over vfpdef or tfpdef */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1260 i += 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1261 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1262 while (res && i+1 < nch) { /* validate (',' vfpdef ['=' test])* */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1263 res = validate_comma(CHILD(tree, i));
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	1264 if (TYPE(CHILD(tree, i+1)) == DOUBLESTAR)
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1265 break;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1266 res = res && validate_vfpdef(CHILD(tree, i+1));
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1267 if (res && i+2 < nch && TYPE(CHILD(tree, i+2)) == EQUAL) {
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	1268 res = res && (i+3 < nch)
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1269 && validate_test(CHILD(tree, i+3));
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1270 i += 4;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1271 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1272 else {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1273 i += 2;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1274 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1275 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1276 /* [',' '*' vfpdef] /
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1277 if (res && i+1 < nch && TYPE(CHILD(tree, i+1)) == DOUBLESTAR) {
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1278 res = validate_vfpdef(CHILD(tree, i+2));
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1279 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1280 }
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1281 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1282 else if (sym == DOUBLESTAR) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1283 /*
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1284 * '**' NAME
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1285 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1286 if (nch-start == 2)
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1287 res = validate_vfpdef(CHILD(tree, start+1));
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1288 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1289 if (!res)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1290 err_string("illegal variable argument trailer for varargslist");
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1291 return res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1292 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1293
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1294
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1295 /* validate_varargslist()
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1296 *
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1297 * Validate typedargslist or varargslist.
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1298 *
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1299 * typedargslist: ((tfpdef ['=' test] ',')*
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1300 * ('' [tfpdef] (',' tfpdef ['=' test]) [',' '**' tfpdef] \|
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1301 * '**' tfpdef)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1302 * \| tfpdef ['=' test] (',' tfpdef ['=' test])* [','])
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1303 * tfpdef: NAME [':' test]
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1304 * varargslist: ((vfpdef ['=' test] ',')*
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1305 * ('' [vfpdef] (',' vfpdef ['=' test]) [',' '**' vfpdef] \|
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1306 * '**' vfpdef)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1307 * \| vfpdef ['=' test] (',' vfpdef ['=' test])* [','])
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1308 * vfpdef: NAME
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1309 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1310 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1311 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1312 validate_varargslist(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1313 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1314 int nch = NCH(tree);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1315 int res = (TYPE(tree) == varargslist \|\|
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1316 TYPE(tree) == typedargslist) &&
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1317 (nch != 0);
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1318 int sym;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1319 node *ch;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1320 int i = 0;
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	1321
15506 ac830c9e9a83 validate_varargslist(): Fix two bugs in this function, one that affected Fred Drake <fdrake@acm.org> parents: 15318 diff changeset	1322 if (!res)
ac830c9e9a83 validate_varargslist(): Fix two bugs in this function, one that affected Fred Drake <fdrake@acm.org> parents: 15318 diff changeset	1323 return 0;
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1324 if (nch < 1) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1325 err_string("varargslist missing child nodes");
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1326 return 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1327 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1328 while (i < nch) {
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	1329 ch = CHILD(tree, i);
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1330 sym = TYPE(ch);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1331 if (sym == vfpdef \|\| sym == tfpdef) {
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1332 /* validate (vfpdef ['=' test] ',')+ */
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1333 res = validate_vfpdef(ch);
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1334 ++i;
15506 ac830c9e9a83 validate_varargslist(): Fix two bugs in this function, one that affected Fred Drake <fdrake@acm.org> parents: 15318 diff changeset	1335 if (res && (i+2 <= nch) && TYPE(CHILD(tree, i)) == EQUAL) {
ac830c9e9a83 validate_varargslist(): Fix two bugs in this function, one that affected Fred Drake <fdrake@acm.org> parents: 15318 diff changeset	1336 res = (validate_equal(CHILD(tree, i))
ac830c9e9a83 validate_varargslist(): Fix two bugs in this function, one that affected Fred Drake <fdrake@acm.org> parents: 15318 diff changeset	1337 && validate_test(CHILD(tree, i+1)));
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1338 if (res)
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1339 i += 2;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1340 }
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1341 if (res && i < nch) {
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1342 res = validate_comma(CHILD(tree, i));
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1343 ++i;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1344 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1345 } else if (sym == DOUBLESTAR \|\| sym == STAR) {
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1346 res = validate_varargslist_trailer(tree, i);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1347 break;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1348 } else {
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1349 res = 0;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1350 err_string("illegal formation for varargslist");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1351 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1352 }
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1353 return res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1354 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1355
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1356
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1357 /* comp_iter: comp_for \| comp_if
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1358 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1359 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1360 validate_comp_iter(node *tree)
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1361 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1362 int res = (validate_ntype(tree, comp_iter)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1363 && validate_numnodes(tree, 1, "comp_iter"));
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1364 if (res && TYPE(CHILD(tree, 0)) == comp_for)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1365 res = validate_comp_for(CHILD(tree, 0));
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1366 else
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1367 res = validate_comp_if(CHILD(tree, 0));
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1368
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1369 return res;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1370 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1371
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1372 /* comp_for: 'for' exprlist 'in' test [comp_iter]
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1373 */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1374 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1375 validate_comp_for(node *tree)
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1376 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1377 int nch = NCH(tree);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1378 int res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1379
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1380 if (nch == 5)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1381 res = validate_comp_iter(CHILD(tree, 4));
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1382 else
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1383 res = validate_numnodes(tree, 4, "comp_for");
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1384
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1385 if (res)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1386 res = (validate_name(CHILD(tree, 0), "for")
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1387 && validate_exprlist(CHILD(tree, 1))
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1388 && validate_name(CHILD(tree, 2), "in")
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	1389 && validate_or_test(CHILD(tree, 3)));
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1390
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1391 return res;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1392 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1393
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1394 /* comp_if: 'if' test_nocond [comp_iter]
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1395 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1396 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1397 validate_comp_if(node *tree)
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1398 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1399 int nch = NCH(tree);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1400 int res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1401
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1402 if (nch == 3)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1403 res = validate_comp_iter(CHILD(tree, 2));
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1404 else
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1405 res = validate_numnodes(tree, 2, "comp_if");
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1406
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1407 if (res)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1408 res = (validate_name(CHILD(tree, 0), "if")
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1409 && validate_test_nocond(CHILD(tree, 1)));
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1410
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1411 return res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1412 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1413
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1414
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1415 /* simple_stmt \| compound_stmt
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1416 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1417 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1418 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1419 validate_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1420 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1421 int res = (validate_ntype(tree, stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1422 && validate_numnodes(tree, 1, "stmt"));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1423
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1424 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1425 tree = CHILD(tree, 0);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1426
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1427 if (TYPE(tree) == simple_stmt)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1428 res = validate_simple_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1429 else
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1430 res = validate_compound_stmt(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1431 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1432 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1433 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1434
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1435
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1436 /* small_stmt (';' small_stmt)* [';'] NEWLINE
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1437 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1438 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1439 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1440 validate_simple_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1441 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1442 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1443 int res = (validate_ntype(tree, simple_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1444 && (nch >= 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1445 && validate_small_stmt(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1446 && validate_newline(CHILD(tree, nch - 1)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1447
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1448 if (nch < 2)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1449 res = validate_numnodes(tree, 2, "simple_stmt");
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1450 --nch; /* forget the NEWLINE */
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1451 if (res && is_even(nch))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1452 res = validate_semi(CHILD(tree, --nch));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1453 if (res && (nch > 2)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1454 int i;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1455
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1456 for (i = 1; res && (i < nch); i += 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1457 res = (validate_semi(CHILD(tree, i))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1458 && validate_small_stmt(CHILD(tree, i + 1)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1459 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1460 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1461 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1462
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1463
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1464 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1465 validate_small_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1466 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1467 int nch = NCH(tree);
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1468 int res = validate_numnodes(tree, 1, "small_stmt");
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1469
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1470 if (res) {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1471 int ntype = TYPE(CHILD(tree, 0));
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1472
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1473 if ( (ntype == expr_stmt)
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1474 \|\| (ntype == del_stmt)
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1475 \|\| (ntype == pass_stmt)
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1476 \|\| (ntype == flow_stmt)
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1477 \|\| (ntype == import_stmt)
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1478 \|\| (ntype == global_stmt)
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39701 diff changeset	1479 \|\| (ntype == assert_stmt))
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1480 res = validate_node(CHILD(tree, 0));
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1481 else {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1482 res = 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1483 err_string("illegal small_stmt child type");
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1484 }
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1485 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1486 else if (nch == 1) {
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1487 res = 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1488 PyErr_Format(parser_error,
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1489 "Unrecognized child node of small_stmt: %d.",
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1490 TYPE(CHILD(tree, 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1491 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1492 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1493 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1494
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1495
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1496 /* compound_stmt:
49908 ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	1497 * if_stmt \| while_stmt \| for_stmt \| try_stmt \| with_stmt \| funcdef \| classdef \| decorated
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1498 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1499 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1500 validate_compound_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1501 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1502 int res = (validate_ntype(tree, compound_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1503 && validate_numnodes(tree, 1, "compound_stmt"));
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1504 int ntype;
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1505
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1506 if (!res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1507 return (0);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1508
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1509 tree = CHILD(tree, 0);
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1510 ntype = TYPE(tree);
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1511 if ( (ntype == if_stmt)
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1512 \|\| (ntype == while_stmt)
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1513 \|\| (ntype == for_stmt)
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1514 \|\| (ntype == try_stmt)
49908 ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	1515 \|\| (ntype == with_stmt)
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1516 \|\| (ntype == funcdef)
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1517 \|\| (ntype == classdef)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1518 \|\| (ntype == decorated))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1519 res = validate_node(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1520 else {
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1521 res = 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1522 PyErr_Format(parser_error,
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1523 "Illegal compound statement type: %d.", TYPE(tree));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1524 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1525 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1526 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1527
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1528 static int
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1529 validate_yield_or_testlist(node *tree, int tse)
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1530 {
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1531 if (TYPE(tree) == yield_expr) {
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1532 return validate_yield_expr(tree);
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1533 }
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1534 else {
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1535 if (tse)
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1536 return validate_testlist_star_expr(tree);
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1537 else
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1538 return validate_testlist(tree);
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1539 }
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1540 }
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1541
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1542 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1543 validate_expr_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1544 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1545 int j;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1546 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1547 int res = (validate_ntype(tree, expr_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1548 && is_odd(nch)
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1549 && validate_testlist_star_expr(CHILD(tree, 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1550
14214 b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1551 if (res && nch == 3
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1552 && TYPE(CHILD(tree, 1)) == augassign) {
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1553 res = validate_numnodes(CHILD(tree, 1), 1, "augassign")
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1554 && validate_yield_or_testlist(CHILD(tree, 2), 0);
14214 b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1555
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1556 if (res) {
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1557 char *s = STR(CHILD(CHILD(tree, 1), 0));
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1558
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1559 res = (strcmp(s, "+=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1560 \|\| strcmp(s, "-=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1561 \|\| strcmp(s, "*=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1562 \|\| strcmp(s, "/=") == 0
27517 51abb5e86226 Teach the parsermodule about floor division. Fixes Michael W. Hudson <mwh@python.net> parents: 26979 diff changeset	1563 \|\| strcmp(s, "//=") == 0
14214 b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1564 \|\| strcmp(s, "%=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1565 \|\| strcmp(s, "&=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1566 \|\| strcmp(s, "\|=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1567 \|\| strcmp(s, "^=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1568 \|\| strcmp(s, "<<=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1569 \|\| strcmp(s, ">>=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1570 \|\| strcmp(s, "**=") == 0);
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1571 if (!res)
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1572 err_string("illegal augmmented assignment operator");
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1573 }
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1574 }
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1575 else {
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1576 for (j = 1; res && (j < nch); j += 2)
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1577 res = validate_equal(CHILD(tree, j))
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	1578 && validate_yield_or_testlist(CHILD(tree, j + 1), 1);
14214 b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1579 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1580 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1581 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1582
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1583
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1584 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1585 validate_del_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1586 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1587 return (validate_numnodes(tree, 2, "del_stmt")
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1588 && validate_name(CHILD(tree, 0), "del")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1589 && validate_exprlist(CHILD(tree, 1)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1590 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1591
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1592
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1593 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1594 validate_return_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1595 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1596 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1597 int res = (validate_ntype(tree, return_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1598 && ((nch == 1) \|\| (nch == 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1599 && validate_name(CHILD(tree, 0), "return"));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1600
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1601 if (res && (nch == 2))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1602 res = validate_testlist(CHILD(tree, 1));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1603
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1604 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1605 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1606
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1607
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1608 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1609 validate_raise_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1610 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1611 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1612 int res = (validate_ntype(tree, raise_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1613 && ((nch == 1) \|\| (nch == 2) \|\| (nch == 4) \|\| (nch == 6)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1614
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1615 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1616 res = validate_name(CHILD(tree, 0), "raise");
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1617 if (res && (nch >= 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1618 res = validate_test(CHILD(tree, 1));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1619 if (res && nch > 2) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1620 res = (validate_comma(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1621 && validate_test(CHILD(tree, 3)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1622 if (res && (nch > 4))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1623 res = (validate_comma(CHILD(tree, 4))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1624 && validate_test(CHILD(tree, 5)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1625 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1626 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1627 else
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1628 (void) validate_numnodes(tree, 2, "raise");
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1629 if (res && (nch == 4))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1630 res = (validate_comma(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1631 && validate_test(CHILD(tree, 3)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1632
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1633 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1634 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1635
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1636
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1637 /* yield_expr: 'yield' [testlist]
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1638 */
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1639 static int
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1640 validate_yield_expr(node *tree)
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1641 {
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1642 int nch = NCH(tree);
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1643 int res = (validate_ntype(tree, yield_expr)
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1644 && ((nch == 1) \|\| (nch == 2))
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1645 && validate_name(CHILD(tree, 0), "yield"));
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1646
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1647 if (res && (nch == 2))
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1648 res = validate_testlist(CHILD(tree, 1));
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1649
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1650 return (res);
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1651 }
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1652
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1653
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1654 /* yield_stmt: yield_expr
18646 c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1655 */
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1656 static int
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1657 validate_yield_stmt(node *tree)
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1658 {
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1659 return (validate_ntype(tree, yield_stmt)
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1660 && validate_numnodes(tree, 1, "yield_stmt")
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1661 && validate_yield_expr(CHILD(tree, 0)));
18646 c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1662 }
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1663
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1664
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1665 static int
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1666 validate_import_as_name(node *tree)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1667 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1668 int nch = NCH(tree);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1669 int ok = validate_ntype(tree, import_as_name);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1670
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1671 if (ok) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1672 if (nch == 1)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1673 ok = validate_name(CHILD(tree, 0), NULL);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1674 else if (nch == 3)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1675 ok = (validate_name(CHILD(tree, 0), NULL)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1676 && validate_name(CHILD(tree, 1), "as")
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1677 && validate_name(CHILD(tree, 2), NULL));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1678 else
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1679 ok = validate_numnodes(tree, 3, "import_as_name");
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1680 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1681 return ok;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1682 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1683
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1684
15751 939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1685 /* dotted_name: NAME ("." NAME)*
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1686 */
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1687 static int
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1688 validate_dotted_name(node *tree)
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1689 {
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1690 int nch = NCH(tree);
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1691 int res = (validate_ntype(tree, dotted_name)
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1692 && is_odd(nch)
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1693 && validate_name(CHILD(tree, 0), NULL));
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1694 int i;
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1695
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1696 for (i = 1; res && (i < nch); i += 2) {
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1697 res = (validate_dot(CHILD(tree, i))
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1698 && validate_name(CHILD(tree, i+1), NULL));
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1699 }
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1700 return res;
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1701 }
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1702
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1703
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1704 /* dotted_as_name: dotted_name [NAME NAME]
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1705 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1706 static int
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1707 validate_dotted_as_name(node *tree)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1708 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1709 int nch = NCH(tree);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1710 int res = validate_ntype(tree, dotted_as_name);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1711
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1712 if (res) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1713 if (nch == 1)
15751 939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1714 res = validate_dotted_name(CHILD(tree, 0));
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1715 else if (nch == 3)
15751 939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1716 res = (validate_dotted_name(CHILD(tree, 0))
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1717 && validate_name(CHILD(tree, 1), "as")
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1718 && validate_name(CHILD(tree, 2), NULL));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1719 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1720 res = 0;
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	1721 err_string("illegal number of children for dotted_as_name");
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1722 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1723 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1724 return res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1725 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1726
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1727
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1728 /* dotted_as_name (',' dotted_as_name)* */
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1729 static int
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1730 validate_dotted_as_names(node *tree)
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1731 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1732 int nch = NCH(tree);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1733 int res = is_odd(nch) && validate_dotted_as_name(CHILD(tree, 0));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1734 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1735
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1736 for (i = 1; res && (i < nch); i += 2)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1737 res = (validate_comma(CHILD(tree, i))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1738 && validate_dotted_as_name(CHILD(tree, i + 1)));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1739 return (res);
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1740 }
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1741
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1742
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1743 /* import_as_name (',' import_as_name)* [','] */
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1744 static int
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1745 validate_import_as_names(node *tree)
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1746 {
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1747 int nch = NCH(tree);
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1748 int res = validate_import_as_name(CHILD(tree, 0));
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1749 int i;
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1750
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1751 for (i = 1; res && (i + 1 < nch); i += 2)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1752 res = (validate_comma(CHILD(tree, i))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1753 && validate_import_as_name(CHILD(tree, i + 1)));
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1754 return (res);
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1755 }
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1756
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1757
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1758 /* 'import' dotted_as_names */
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1759 static int
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1760 validate_import_name(node *tree)
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1761 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1762 return (validate_ntype(tree, import_name)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1763 && validate_numnodes(tree, 2, "import_name")
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1764 && validate_name(CHILD(tree, 0), "import")
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1765 && validate_dotted_as_names(CHILD(tree, 1)));
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1766 }
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1767
62790 fb360c079059 Issue #9130: Validate ellipsis tokens in relative imports. Mark Dickinson <dickinsm@gmail.com> parents: 62787 diff changeset	1768 /* Helper function to count the number of leading dots (or ellipsis tokens) in
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1769 * 'from ...module import name'
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1770 */
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1771 static int
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1772 count_from_dots(node *tree)
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1773 {
62790 fb360c079059 Issue #9130: Validate ellipsis tokens in relative imports. Mark Dickinson <dickinsm@gmail.com> parents: 62787 diff changeset	1774 int i;
fb360c079059 Issue #9130: Validate ellipsis tokens in relative imports. Mark Dickinson <dickinsm@gmail.com> parents: 62787 diff changeset	1775 for (i = 1; i < NCH(tree); i++)
fb360c079059 Issue #9130: Validate ellipsis tokens in relative imports. Mark Dickinson <dickinsm@gmail.com> parents: 62787 diff changeset	1776 if (TYPE(CHILD(tree, i)) != DOT && TYPE(CHILD(tree, i)) != ELLIPSIS)
fb360c079059 Issue #9130: Validate ellipsis tokens in relative imports. Mark Dickinson <dickinsm@gmail.com> parents: 62787 diff changeset	1777 break;
fb360c079059 Issue #9130: Validate ellipsis tokens in relative imports. Mark Dickinson <dickinsm@gmail.com> parents: 62787 diff changeset	1778 return i - 1;
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1779 }
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1780
62787 c6f16b8cb858 Issue #9130: Fix validation of relative imports in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 62772 diff changeset	1781 /* import_from: ('from' ('.'* dotted_name \| '.'+)
c6f16b8cb858 Issue #9130: Fix validation of relative imports in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 62772 diff changeset	1782 * 'import' ('*' \| '(' import_as_names ')' \| import_as_names))
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1783 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1784 static int
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1785 validate_import_from(node *tree)
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1786 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1787 int nch = NCH(tree);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1788 int ndots = count_from_dots(tree);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1789 int havename = (TYPE(CHILD(tree, ndots + 1)) == dotted_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1790 int offset = ndots + havename;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1791 int res = validate_ntype(tree, import_from)
62787 c6f16b8cb858 Issue #9130: Fix validation of relative imports in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 62772 diff changeset	1792 && (offset >= 1)
c6f16b8cb858 Issue #9130: Fix validation of relative imports in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 62772 diff changeset	1793 && (nch >= 3 + offset)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1794 && validate_name(CHILD(tree, 0), "from")
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1795 && (!havename \|\| validate_dotted_name(CHILD(tree, ndots + 1)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1796 && validate_name(CHILD(tree, offset + 1), "import");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1797
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1798 if (res && TYPE(CHILD(tree, offset + 2)) == LPAR)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1799 res = ((nch == offset + 5)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1800 && validate_lparen(CHILD(tree, offset + 2))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1801 && validate_import_as_names(CHILD(tree, offset + 3))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1802 && validate_rparen(CHILD(tree, offset + 4)));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1803 else if (res && TYPE(CHILD(tree, offset + 2)) != STAR)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1804 res = validate_import_as_names(CHILD(tree, offset + 2));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1805 return (res);
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1806 }
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1807
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1808
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1809 /* import_stmt: import_name \| import_from */
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1810 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1811 validate_import_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1812 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1813 int nch = NCH(tree);
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1814 int res = validate_numnodes(tree, 1, "import_stmt");
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1815
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1816 if (res) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1817 int ntype = TYPE(CHILD(tree, 0));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1818
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	1819 if (ntype == import_name \|\| ntype == import_from)
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1820 res = validate_node(CHILD(tree, 0));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1821 else {
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1822 res = 0;
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1823 err_string("illegal import_stmt child type");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1824 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1825 }
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1826 else if (nch == 1) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1827 res = 0;
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1828 PyErr_Format(parser_error,
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1829 "Unrecognized child node of import_stmt: %d.",
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1830 TYPE(CHILD(tree, 0)));
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1831 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1832 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1833 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1834
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1835
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1836
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1837
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1838 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1839 validate_global_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1840 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1841 int j;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1842 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1843 int res = (validate_ntype(tree, global_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1844 && is_even(nch) && (nch >= 2));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1845
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	1846 if (!res && !PyErr_Occurred())
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	1847 err_string("illegal global statement");
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	1848
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1849 if (res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1850 res = (validate_name(CHILD(tree, 0), "global")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1851 && validate_ntype(CHILD(tree, 1), NAME));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1852 for (j = 2; res && (j < nch); j += 2)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1853 res = (validate_comma(CHILD(tree, j))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1854 && validate_ntype(CHILD(tree, j + 1), NAME));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1855
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1856 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1857 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1858
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1859
5236 b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1860 /* assert_stmt:
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1861 *
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1862 * 'assert' test [',' test]
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1863 */
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1864 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1865 validate_assert_stmt(node *tree)
5236 b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1866 {
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1867 int nch = NCH(tree);
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1868 int res = (validate_ntype(tree, assert_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1869 && ((nch == 2) \|\| (nch == 4))
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	1870 && (validate_name(CHILD(tree, 0), "assert"))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1871 && validate_test(CHILD(tree, 1)));
5236 b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1872
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1873 if (!res && !PyErr_Occurred())
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	1874 err_string("illegal assert statement");
5236 b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1875 if (res && (nch > 2))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1876 res = (validate_comma(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1877 && validate_test(CHILD(tree, 3)));
5236 b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1878
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1879 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1880 }
5236 b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1881
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1882
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1883 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1884 validate_while(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1885 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1886 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1887 int res = (validate_ntype(tree, while_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1888 && ((nch == 4) \|\| (nch == 7))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1889 && validate_name(CHILD(tree, 0), "while")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1890 && validate_test(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1891 && validate_colon(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1892 && validate_suite(CHILD(tree, 3)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1893
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1894 if (res && (nch == 7))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1895 res = (validate_name(CHILD(tree, 4), "else")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1896 && validate_colon(CHILD(tree, 5))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1897 && validate_suite(CHILD(tree, 6)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1898
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1899 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1900 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1901
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1902
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1903 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1904 validate_for(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1905 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1906 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1907 int res = (validate_ntype(tree, for_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1908 && ((nch == 6) \|\| (nch == 9))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1909 && validate_name(CHILD(tree, 0), "for")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1910 && validate_exprlist(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1911 && validate_name(CHILD(tree, 2), "in")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1912 && validate_testlist(CHILD(tree, 3))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1913 && validate_colon(CHILD(tree, 4))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1914 && validate_suite(CHILD(tree, 5)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1915
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1916 if (res && (nch == 9))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1917 res = (validate_name(CHILD(tree, 6), "else")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1918 && validate_colon(CHILD(tree, 7))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1919 && validate_suite(CHILD(tree, 8)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1920
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1921 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1922 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1923
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1924
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1925 /* try_stmt:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1926 * 'try' ':' suite (except_clause ':' suite)+ ['else' ':' suite]
50079 a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1927 ['finally' ':' suite]
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1928 * \| 'try' ':' suite 'finally' ':' suite
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1929 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1930 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1931 static int
13503 6484098f40fc ANSI-fying Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13466 diff changeset	1932 validate_try(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1933 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1934 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1935 int pos = 3;
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1936 int res = (validate_ntype(tree, try_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1937 && (nch >= 6) && ((nch % 3) == 0));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1938
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1939 if (res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1940 res = (validate_name(CHILD(tree, 0), "try")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1941 && validate_colon(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1942 && validate_suite(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1943 && validate_colon(CHILD(tree, nch - 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1944 && validate_suite(CHILD(tree, nch - 1)));
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1945 else if (!PyErr_Occurred()) {
13325 7bac10a9bb61 Andrew Kuchling <akuchlin@mems-exchange.org>: Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	1946 const char* name = "except";
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1947 if (TYPE(CHILD(tree, nch - 3)) != except_clause)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1948 name = STR(CHILD(tree, nch - 3));
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1949
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1950 PyErr_Format(parser_error,
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1951 "Illegal number of children for try/%s node.", name);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1952 }
50079 a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1953 /* Handle try/finally statement */
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1954 if (res && (TYPE(CHILD(tree, pos)) == NAME) &&
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1955 (strcmp(STR(CHILD(tree, pos)), "finally") == 0)) {
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1956 res = (validate_numnodes(tree, 6, "try/finally")
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1957 && validate_colon(CHILD(tree, 4))
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1958 && validate_suite(CHILD(tree, 5)));
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1959 return (res);
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1960 }
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1961 /* try/except statement: skip past except_clause sections */
54082 17d1946540d4 Merged revisions 72645 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	1962 while (res && pos < nch && (TYPE(CHILD(tree, pos)) == except_clause)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1963 res = (validate_except_clause(CHILD(tree, pos))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1964 && validate_colon(CHILD(tree, pos + 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1965 && validate_suite(CHILD(tree, pos + 2)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1966 pos += 3;
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1967 }
50079 a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1968 /* skip else clause */
54082 17d1946540d4 Merged revisions 72645 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	1969 if (res && pos < nch && (TYPE(CHILD(tree, pos)) == NAME) &&
50079 a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1970 (strcmp(STR(CHILD(tree, pos)), "else") == 0)) {
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1971 res = (validate_colon(CHILD(tree, pos + 1))
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1972 && validate_suite(CHILD(tree, pos + 2)));
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1973 pos += 3;
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1974 }
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1975 if (res && pos < nch) {
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1976 /* last clause must be a finally */
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1977 res = (validate_name(CHILD(tree, pos), "finally")
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1978 && validate_numnodes(tree, pos + 3, "try/except/finally")
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1979 && validate_colon(CHILD(tree, pos + 1))
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1980 && validate_suite(CHILD(tree, pos + 2)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1981 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1982 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1983 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1984
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1985
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1986 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1987 validate_except_clause(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1988 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1989 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1990 int res = (validate_ntype(tree, except_clause)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1991 && ((nch == 1) \|\| (nch == 2) \|\| (nch == 4))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1992 && validate_name(CHILD(tree, 0), "except"));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1993
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1994 if (res && (nch > 1))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1995 res = validate_test(CHILD(tree, 1));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1996 if (res && (nch == 4))
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1997 res = (validate_name(CHILD(tree, 2), "as")
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1998 && validate_ntype(CHILD(tree, 3), NAME));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1999
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2000 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2001 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2002
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2003
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2004 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2005 validate_test(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2006 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2007 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2008 int res = validate_ntype(tree, test) && is_odd(nch);
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2009
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2010 if (res && (TYPE(CHILD(tree, 0)) == lambdef))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2011 res = ((nch == 1)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2012 && validate_lambdef(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2013 else if (res) {
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2014 res = validate_or_test(CHILD(tree, 0));
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2015 res = (res && (nch == 1 \|\| (nch == 5 &&
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2016 validate_name(CHILD(tree, 1), "if") &&
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2017 validate_or_test(CHILD(tree, 2)) &&
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2018 validate_name(CHILD(tree, 3), "else") &&
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2019 validate_test(CHILD(tree, 4)))));
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2020 }
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2021 return (res);
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2022 }
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2023
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2024 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2025 validate_test_nocond(node *tree)
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2026 {
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2027 int nch = NCH(tree);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2028 int res = validate_ntype(tree, test_nocond) && (nch == 1);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2029
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2030 if (res && (TYPE(CHILD(tree, 0)) == lambdef_nocond))
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2031 res = (validate_lambdef_nocond(CHILD(tree, 0)));
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2032 else if (res) {
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2033 res = (validate_or_test(CHILD(tree, 0)));
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2034 }
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2035 return (res);
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2036 }
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2037
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2038 static int
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2039 validate_or_test(node *tree)
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2040 {
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2041 int nch = NCH(tree);
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2042 int res = validate_ntype(tree, or_test) && is_odd(nch);
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2043
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2044 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2045 int pos;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2046 res = validate_and_test(CHILD(tree, 0));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2047 for (pos = 1; res && (pos < nch); pos += 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2048 res = (validate_name(CHILD(tree, pos), "or")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2049 && validate_and_test(CHILD(tree, pos + 1)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2050 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2051 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2052 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2053
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2054
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2055 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2056 validate_and_test(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2057 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2058 int pos;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2059 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2060 int res = (validate_ntype(tree, and_test)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2061 && is_odd(nch)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2062 && validate_not_test(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2063
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2064 for (pos = 1; res && (pos < nch); pos += 2)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2065 res = (validate_name(CHILD(tree, pos), "and")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2066 && validate_not_test(CHILD(tree, 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2067
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2068 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2069 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2070
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2071
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2072 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2073 validate_not_test(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2074 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2075 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2076 int res = validate_ntype(tree, not_test) && ((nch == 1) \|\| (nch == 2));
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2077
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2078 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2079 if (nch == 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2080 res = (validate_name(CHILD(tree, 0), "not")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2081 && validate_not_test(CHILD(tree, 1)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2082 else if (nch == 1)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2083 res = validate_comparison(CHILD(tree, 0));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2084 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2085 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2086 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2087
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2088
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2089 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2090 validate_comparison(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2091 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2092 int pos;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2093 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2094 int res = (validate_ntype(tree, comparison)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2095 && is_odd(nch)
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2096 && validate_expr(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2097
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2098 for (pos = 1; res && (pos < nch); pos += 2)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2099 res = (validate_comp_op(CHILD(tree, pos))
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2100 && validate_expr(CHILD(tree, pos + 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2101
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2102 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2103 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2104
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2105
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2106 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2107 validate_comp_op(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2108 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2109 int res = 0;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2110 int nch = NCH(tree);
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2111
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2112 if (!validate_ntype(tree, comp_op))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2113 return (0);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2114 if (nch == 1) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2115 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2116 * Only child will be a terminal with a well-defined symbolic name
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2117 * or a NAME with a string of either 'is' or 'in'
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2118 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2119 tree = CHILD(tree, 0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2120 switch (TYPE(tree)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2121 case LESS:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2122 case GREATER:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2123 case EQEQUAL:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2124 case EQUAL:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2125 case LESSEQUAL:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2126 case GREATEREQUAL:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2127 case NOTEQUAL:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2128 res = 1;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2129 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2130 case NAME:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2131 res = ((strcmp(STR(tree), "in") == 0)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2132 \|\| (strcmp(STR(tree), "is") == 0));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2133 if (!res) {
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	2134 PyErr_Format(parser_error,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	2135 "illegal operator '%s'", STR(tree));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2136 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2137 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2138 default:
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	2139 err_string("illegal comparison operator type");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2140 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2141 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2142 }
4600 d36250aefb82 Keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2143 else if ((res = validate_numnodes(tree, 2, "comp_op")) != 0) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2144 res = (validate_ntype(CHILD(tree, 0), NAME)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2145 && validate_ntype(CHILD(tree, 1), NAME)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2146 && (((strcmp(STR(CHILD(tree, 0)), "is") == 0)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2147 && (strcmp(STR(CHILD(tree, 1)), "not") == 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2148 \|\| ((strcmp(STR(CHILD(tree, 0)), "not") == 0)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2149 && (strcmp(STR(CHILD(tree, 1)), "in") == 0))));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2150 if (!res && !PyErr_Occurred())
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	2151 err_string("unknown comparison operator");
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2152 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2153 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2154 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2155
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2156
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2157 static int
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2158 validate_star_expr(node *tree)
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2159 {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2160 int res = validate_ntype(tree, star_expr);
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2161 if (!res) return res;
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2162 if (!validate_numnodes(tree, 2, "star_expr"))
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2163 return 0;
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2164 return validate_ntype(CHILD(tree, 0), STAR) && \
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2165 validate_expr(CHILD(tree, 1));
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2166 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2167
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2168
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2169 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2170 validate_expr(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2171 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2172 int j;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2173 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2174 int res = (validate_ntype(tree, expr)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2175 && is_odd(nch)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2176 && validate_xor_expr(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2177
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2178 for (j = 2; res && (j < nch); j += 2)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2179 res = (validate_xor_expr(CHILD(tree, j))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2180 && validate_vbar(CHILD(tree, j - 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2181
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2182 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2183 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2184
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2185
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2186 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2187 validate_xor_expr(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2188 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2189 int j;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2190 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2191 int res = (validate_ntype(tree, xor_expr)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2192 && is_odd(nch)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2193 && validate_and_expr(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2194
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2195 for (j = 2; res && (j < nch); j += 2)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2196 res = (validate_circumflex(CHILD(tree, j - 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2197 && validate_and_expr(CHILD(tree, j)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2198
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2199 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2200 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2201
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2202
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2203 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2204 validate_and_expr(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2205 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2206 int pos;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2207 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2208 int res = (validate_ntype(tree, and_expr)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2209 && is_odd(nch)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2210 && validate_shift_expr(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2211
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2212 for (pos = 1; res && (pos < nch); pos += 2)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2213 res = (validate_ampersand(CHILD(tree, pos))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2214 && validate_shift_expr(CHILD(tree, pos + 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2215
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2216 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2217 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2218
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2219
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2220 static int
13503 6484098f40fc ANSI-fying Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13466 diff changeset	2221 validate_chain_two_ops(node tree, int (termvalid)(node *), int op1, int op2)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2222 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2223 int pos = 1;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2224 int nch = NCH(tree);
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2225 int res = (is_odd(nch)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2226 && (*termvalid)(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2227
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2228 for ( ; res && (pos < nch); pos += 2) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2229 if (TYPE(CHILD(tree, pos)) != op1)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2230 res = validate_ntype(CHILD(tree, pos), op2);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2231 if (res)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2232 res = (*termvalid)(CHILD(tree, pos + 1));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2233 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2234 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2235 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2236
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2237
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2238 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2239 validate_shift_expr(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2240 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2241 return (validate_ntype(tree, shift_expr)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2242 && validate_chain_two_ops(tree, validate_arith_expr,
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2243 LEFTSHIFT, RIGHTSHIFT));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2244 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2245
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2246
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2247 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2248 validate_arith_expr(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2249 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2250 return (validate_ntype(tree, arith_expr)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2251 && validate_chain_two_ops(tree, validate_term, PLUS, MINUS));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2252 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2253
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2254
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2255 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2256 validate_term(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2257 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2258 int pos = 1;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2259 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2260 int res = (validate_ntype(tree, term)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2261 && is_odd(nch)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2262 && validate_factor(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2263
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2264 for ( ; res && (pos < nch); pos += 2)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2265 res = (((TYPE(CHILD(tree, pos)) == STAR)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2266 \|\| (TYPE(CHILD(tree, pos)) == SLASH)
27517 51abb5e86226 Teach the parsermodule about floor division. Fixes Michael W. Hudson <mwh@python.net> parents: 26979 diff changeset	2267 \|\| (TYPE(CHILD(tree, pos)) == DOUBLESLASH)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2268 \|\| (TYPE(CHILD(tree, pos)) == PERCENT))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2269 && validate_factor(CHILD(tree, pos + 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2270
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2271 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2272 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2273
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2274
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2275 /* factor:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2276 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2277 * factor: ('+'\|'-'\|'~') factor \| power
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2278 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2279 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2280 validate_factor(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2281 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2282 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2283 int res = (validate_ntype(tree, factor)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2284 && (((nch == 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2285 && ((TYPE(CHILD(tree, 0)) == PLUS)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2286 \|\| (TYPE(CHILD(tree, 0)) == MINUS)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2287 \|\| (TYPE(CHILD(tree, 0)) == TILDE))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2288 && validate_factor(CHILD(tree, 1)))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2289 \|\| ((nch == 1)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2290 && validate_power(CHILD(tree, 0)))));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2291 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2292 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2293
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2294
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2295 /* power:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2296 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2297 * power: atom trailer* ('*' factor)
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2298 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2299 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2300 validate_power(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2301 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2302 int pos = 1;
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2303 int nch = NCH(tree);
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2304 int res = (validate_ntype(tree, power) && (nch >= 1)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2305 && validate_atom(CHILD(tree, 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2306
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2307 while (res && (pos < nch) && (TYPE(CHILD(tree, pos)) == trailer))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2308 res = validate_trailer(CHILD(tree, pos++));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2309 if (res && (pos < nch)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2310 if (!is_even(nch - pos)) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	2311 err_string("illegal number of nodes for 'power'");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2312 return (0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2313 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2314 for ( ; res && (pos < (nch - 1)); pos += 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2315 res = (validate_doublestar(CHILD(tree, pos))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2316 && validate_factor(CHILD(tree, pos + 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2317 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2318 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2319 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2320
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2321
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2322 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2323 validate_atom(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2324 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2325 int pos;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2326 int nch = NCH(tree);
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2327 int res = validate_ntype(tree, atom);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2328
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2329 if (res && nch < 1)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2330 res = validate_numnodes(tree, nch+1, "atom");
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2331 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2332 switch (TYPE(CHILD(tree, 0))) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2333 case LPAR:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2334 res = ((nch <= 3)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2335 && (validate_rparen(CHILD(tree, nch - 1))));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2336
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	2337 if (res && (nch == 3)) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2338 if (TYPE(CHILD(tree, 1))==yield_expr)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2339 res = validate_yield_expr(CHILD(tree, 1));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2340 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2341 res = validate_testlist_comp(CHILD(tree, 1));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2342 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2343 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2344 case LSQB:
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2345 if (nch == 2)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2346 res = validate_ntype(CHILD(tree, 1), RSQB);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2347 else if (nch == 3)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2348 res = (validate_testlist_comp(CHILD(tree, 1))
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2349 && validate_ntype(CHILD(tree, 2), RSQB));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2350 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2351 res = 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2352 err_string("illegal list display atom");
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2353 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2354 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2355 case LBRACE:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2356 res = ((nch <= 3)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2357 && validate_ntype(CHILD(tree, nch - 1), RBRACE));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2358
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2359 if (res && (nch == 3))
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2360 res = validate_dictorsetmaker(CHILD(tree, 1));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2361 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2362 case NAME:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2363 case NUMBER:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2364 res = (nch == 1);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2365 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2366 case STRING:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2367 for (pos = 1; res && (pos < nch); ++pos)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2368 res = validate_ntype(CHILD(tree, pos), STRING);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2369 break;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2370 case DOT:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2371 res = (nch == 3 &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2372 validate_ntype(CHILD(tree, 1), DOT) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2373 validate_ntype(CHILD(tree, 2), DOT));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2374 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2375 default:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2376 res = 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2377 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2378 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2379 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2380 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2381 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2382
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2383
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2384 /* testlist_comp:
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2385 * test ( comp_for \| (',' test)* [','] )
14129 2c2ae86dfe87 validate_listmaker(): Revise to match Skip's latest changes to the Fred Drake <fdrake@acm.org> parents: 14113 diff changeset	2386 */
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2387 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2388 validate_testlist_comp(node *tree)
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2389 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2390 int nch = NCH(tree);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2391 int ok = nch;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2392
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2393 if (nch == 0)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2394 err_string("missing child nodes of testlist_comp");
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2395 else {
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2396 ok = validate_test_or_star_expr(CHILD(tree, 0));
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2397 }
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2398
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2399 /*
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2400 * comp_for \| (',' test)* [',']
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2401 */
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2402 if (nch == 2 && TYPE(CHILD(tree, 1)) == comp_for)
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2403 ok = validate_comp_for(CHILD(tree, 1));
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2404 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2405 /* (',' test)* [','] */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2406 int i = 1;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2407 while (ok && nch - i >= 2) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2408 ok = (validate_comma(CHILD(tree, i))
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2409 && validate_test_or_star_expr(CHILD(tree, i+1)));
14129 2c2ae86dfe87 validate_listmaker(): Revise to match Skip's latest changes to the Fred Drake <fdrake@acm.org> parents: 14113 diff changeset	2410 i += 2;
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2411 }
14129 2c2ae86dfe87 validate_listmaker(): Revise to match Skip's latest changes to the Fred Drake <fdrake@acm.org> parents: 14113 diff changeset	2412 if (ok && i == nch-1)
2c2ae86dfe87 validate_listmaker(): Revise to match Skip's latest changes to the Fred Drake <fdrake@acm.org> parents: 14113 diff changeset	2413 ok = validate_comma(CHILD(tree, i));
2c2ae86dfe87 validate_listmaker(): Revise to match Skip's latest changes to the Fred Drake <fdrake@acm.org> parents: 14113 diff changeset	2414 else if (i != nch) {
2c2ae86dfe87 validate_listmaker(): Revise to match Skip's latest changes to the Fred Drake <fdrake@acm.org> parents: 14113 diff changeset	2415 ok = 0;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2416 err_string("illegal trailing nodes for testlist_comp");
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2417 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2418 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2419 return ok;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2420 }
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2421
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2422 /* decorator:
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2423 * '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2424 */
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2425 static int
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2426 validate_decorator(node *tree)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2427 {
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2428 int ok;
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2429 int nch = NCH(tree);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2430 ok = (validate_ntype(tree, decorator) &&
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2431 (nch == 3 \|\| nch == 5 \|\| nch == 6) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2432 validate_at(CHILD(tree, 0)) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2433 validate_dotted_name(CHILD(tree, 1)) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2434 validate_newline(RCHILD(tree, -1)));
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2435
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2436 if (ok && nch != 3) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2437 ok = (validate_lparen(CHILD(tree, 2)) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2438 validate_rparen(RCHILD(tree, -2)));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2439
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2440 if (ok && nch == 6)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2441 ok = validate_arglist(CHILD(tree, 3));
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2442 }
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2443
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2444 return ok;
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2445 }
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2446
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2447 /* decorators:
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2448 * decorator+
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2449 */
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2450 static int
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2451 validate_decorators(node *tree)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2452 {
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	2453 int i, nch, ok;
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2454 nch = NCH(tree);
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2455 ok = validate_ntype(tree, decorators) && nch >= 1;
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2456
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2457 for (i = 0; ok && i < nch; ++i)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2458 ok = validate_decorator(CHILD(tree, i));
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2459
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2460 return ok;
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2461 }
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2462
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2463 /* with_item:
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2464 * test ['as' expr]
49908 ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2465 */
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2466 static int
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2467 validate_with_item(node *tree)
49908 ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2468 {
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2469 int nch = NCH(tree);
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2470 int ok = (validate_ntype(tree, with_item)
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2471 && (nch == 1 \|\| nch == 3)
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2472 && validate_test(CHILD(tree, 0)));
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2473 if (ok && nch == 3)
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2474 ok = (validate_name(CHILD(tree, 1), "as")
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2475 && validate_expr(CHILD(tree, 2)));
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2476 return ok;
49908 ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2477 }
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2478
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2479 /* with_stmt:
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2480 * 0 1 ... -2 -1
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2481 * 'with' with_item (',' with_item)* ':' suite
49908 ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2482 */
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2483 static int
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2484 validate_with_stmt(node *tree)
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2485 {
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2486 int i;
49908 ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2487 int nch = NCH(tree);
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2488 int ok = (validate_ntype(tree, with_stmt)
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2489 && (nch % 2 == 0)
49908 ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2490 && validate_name(CHILD(tree, 0), "with")
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2491 && validate_colon(RCHILD(tree, -2))
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2492 && validate_suite(RCHILD(tree, -1)));
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2493 for (i = 1; ok && i < nch - 2; i += 2)
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2494 ok = validate_with_item(CHILD(tree, i));
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2495 return ok;
49908 ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2496 }
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2497
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2498 /* funcdef:
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	2499 *
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2500 * -5 -4 -3 -2 -1
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2501 * 'def' NAME parameters ':' suite
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2502 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2503 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2504 validate_funcdef(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2505 {
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2506 int nch = NCH(tree);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2507 int ok = (validate_ntype(tree, funcdef)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2508 && (nch == 5)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2509 && validate_name(RCHILD(tree, -5), "def")
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2510 && validate_ntype(RCHILD(tree, -4), NAME)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2511 && validate_colon(RCHILD(tree, -2))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2512 && validate_parameters(RCHILD(tree, -3))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2513 && validate_suite(RCHILD(tree, -1)));
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2514 return ok;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2515 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2516
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2517
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2518 /* decorated
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2519 * decorators (classdef \| funcdef)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2520 */
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2521 static int
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2522 validate_decorated(node *tree)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2523 {
62772 1eaf4bbe4b1c Issue #9128: Fix validation of class decorators in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 61466 diff changeset	2524 int nch = NCH(tree);
1eaf4bbe4b1c Issue #9128: Fix validation of class decorators in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 61466 diff changeset	2525 int ok = (validate_ntype(tree, decorated)
1eaf4bbe4b1c Issue #9128: Fix validation of class decorators in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 61466 diff changeset	2526 && (nch == 2)
1eaf4bbe4b1c Issue #9128: Fix validation of class decorators in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 61466 diff changeset	2527 && validate_decorators(RCHILD(tree, -2)));
1eaf4bbe4b1c Issue #9128: Fix validation of class decorators in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 61466 diff changeset	2528 if (TYPE(RCHILD(tree, -1)) == funcdef)
1eaf4bbe4b1c Issue #9128: Fix validation of class decorators in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 61466 diff changeset	2529 ok = ok && validate_funcdef(RCHILD(tree, -1));
1eaf4bbe4b1c Issue #9128: Fix validation of class decorators in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 61466 diff changeset	2530 else
1eaf4bbe4b1c Issue #9128: Fix validation of class decorators in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 61466 diff changeset	2531 ok = ok && validate_class(RCHILD(tree, -1));
1eaf4bbe4b1c Issue #9128: Fix validation of class decorators in parser module. Mark Dickinson <dickinsm@gmail.com> parents: 61466 diff changeset	2532 return ok;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2533 }
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2534
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2535 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2536 validate_lambdef(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2537 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2538 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2539 int res = (validate_ntype(tree, lambdef)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2540 && ((nch == 3) \|\| (nch == 4))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2541 && validate_name(CHILD(tree, 0), "lambda")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2542 && validate_colon(CHILD(tree, nch - 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2543 && validate_test(CHILD(tree, nch - 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2544
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2545 if (res && (nch == 4))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2546 res = validate_varargslist(CHILD(tree, 1));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2547 else if (!res && !PyErr_Occurred())
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2548 (void) validate_numnodes(tree, 3, "lambdef");
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2549
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2550 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2551 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2552
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2553
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2554 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2555 validate_lambdef_nocond(node *tree)
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2556 {
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2557 int nch = NCH(tree);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2558 int res = (validate_ntype(tree, lambdef_nocond)
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2559 && ((nch == 3) \|\| (nch == 4))
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2560 && validate_name(CHILD(tree, 0), "lambda")
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2561 && validate_colon(CHILD(tree, nch - 2))
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2562 && validate_test(CHILD(tree, nch - 1)));
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2563
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2564 if (res && (nch == 4))
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2565 res = validate_varargslist(CHILD(tree, 1));
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2566 else if (!res && !PyErr_Occurred())
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2567 (void) validate_numnodes(tree, 3, "lambdef_nocond");
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2568
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2569 return (res);
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2570 }
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2571
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2572
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2573 /* arglist:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2574 *
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2575 * (argument ',')* (argument [','] \| '' test [',' '' test] \| '*' test)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2576 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2577 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2578 validate_arglist(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2579 {
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2580 int nch = NCH(tree);
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2581 int i = 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2582 int ok = 1;
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2583
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2584 if (nch <= 0)
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2585 /* raise the right error from having an invalid number of children */
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2586 return validate_numnodes(tree, nch + 1, "arglist");
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2587
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2588 if (nch > 1) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2589 for (i=0; i<nch; i++) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2590 if (TYPE(CHILD(tree, i)) == argument) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2591 node *ch = CHILD(tree, i);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2592 if (NCH(ch) == 2 && TYPE(CHILD(ch, 1)) == comp_for) {
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2593 err_string("need '(', ')' for generator expression");
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2594 return 0;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2595 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2596 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2597 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2598 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2599
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2600 while (ok && nch-i >= 2) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2601 /* skip leading (argument ',') */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2602 ok = (validate_argument(CHILD(tree, i))
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2603 && validate_comma(CHILD(tree, i+1)));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2604 if (ok)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2605 i += 2;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2606 else
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2607 PyErr_Clear();
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2608 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2609 ok = 1;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2610 if (nch-i > 0) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2611 /*
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2612 * argument \| '' test [',' '' test] \| '*' test
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2613 */
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2614 int sym = TYPE(CHILD(tree, i));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2615
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2616 if (sym == argument) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2617 ok = validate_argument(CHILD(tree, i));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2618 if (ok && i+1 != nch) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2619 err_string("illegal arglist specification"
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2620 " (extra stuff on end)");
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2621 ok = 0;
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2622 }
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2623 }
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2624 else if (sym == STAR) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2625 ok = validate_star(CHILD(tree, i));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2626 if (ok && (nch-i == 2))
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2627 ok = validate_test(CHILD(tree, i+1));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2628 else if (ok && (nch-i == 5))
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2629 ok = (validate_test(CHILD(tree, i+1))
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2630 && validate_comma(CHILD(tree, i+2))
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2631 && validate_doublestar(CHILD(tree, i+3))
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2632 && validate_test(CHILD(tree, i+4)));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2633 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2634 err_string("illegal use of '*' in arglist");
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2635 ok = 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2636 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2637 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2638 else if (sym == DOUBLESTAR) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2639 if (nch-i == 2)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2640 ok = (validate_doublestar(CHILD(tree, i))
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2641 && validate_test(CHILD(tree, i+1)));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2642 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2643 err_string("illegal use of '**' in arglist");
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2644 ok = 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2645 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2646 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2647 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2648 err_string("illegal arglist specification");
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2649 ok = 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2650 }
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2651 }
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2652 return (ok);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2653 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2654
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2655
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2656
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2657 /* argument:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2658 *
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2659 * [test '='] test [comp_for]
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2660 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2661 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2662 validate_argument(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2663 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2664 int nch = NCH(tree);
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2665 int res = (validate_ntype(tree, argument)
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2666 && ((nch == 1) \|\| (nch == 2) \|\| (nch == 3))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2667 && validate_test(CHILD(tree, 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2668
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2669 if (res && (nch == 2))
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2670 res = validate_comp_for(CHILD(tree, 1));
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2671 else if (res && (nch == 3))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2672 res = (validate_equal(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2673 && validate_test(CHILD(tree, 2)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2674
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2675 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2676 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2677
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2678
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2679
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2680 /* trailer:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2681 *
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2682 * '(' [arglist] ')' \| '[' subscriptlist ']' \| '.' NAME
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2683 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2684 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2685 validate_trailer(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2686 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2687 int nch = NCH(tree);
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2688 int res = validate_ntype(tree, trailer) && ((nch == 2) \|\| (nch == 3));
1406 474823e5f7dc * parsermodule.c, Makefile, config.c: rudimentary interface to the Python Guido van Rossum <guido@python.org> parents: diff changeset	2689
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2690 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2691 switch (TYPE(CHILD(tree, 0))) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2692 case LPAR:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2693 res = validate_rparen(CHILD(tree, nch - 1));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2694 if (res && (nch == 3))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2695 res = validate_arglist(CHILD(tree, 1));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2696 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2697 case LSQB:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2698 res = (validate_numnodes(tree, 3, "trailer")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2699 && validate_subscriptlist(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2700 && validate_ntype(CHILD(tree, 2), RSQB));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2701 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2702 case DOT:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2703 res = (validate_numnodes(tree, 2, "trailer")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2704 && validate_ntype(CHILD(tree, 1), NAME));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2705 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2706 default:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2707 res = 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2708 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2709 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2710 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2711 else {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2712 (void) validate_numnodes(tree, 2, "trailer");
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2713 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2714 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2715 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2716
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2717
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2718 /* subscriptlist:
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2719 *
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2720 * subscript (',' subscript)* [',']
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2721 */
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2722 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2723 validate_subscriptlist(node *tree)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2724 {
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2725 return (validate_repeating_list(tree, subscriptlist,
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2726 validate_subscript, "subscriptlist"));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2727 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2728
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2729
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2730 /* subscript:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2731 *
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2732 * '.' '.' '.' \| test \| [test] ':' [test] [sliceop]
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2733 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2734 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2735 validate_subscript(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2736 {
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2737 int offset = 0;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2738 int nch = NCH(tree);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2739 int res = validate_ntype(tree, subscript) && (nch >= 1) && (nch <= 4);
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2740
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2741 if (!res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2742 if (!PyErr_Occurred())
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2743 err_string("invalid number of arguments for subscript node");
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2744 return (0);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2745 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2746 if (TYPE(CHILD(tree, 0)) == DOT)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2747 /* take care of ('.' '.' '.') possibility */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2748 return (validate_numnodes(tree, 3, "subscript")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2749 && validate_dot(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2750 && validate_dot(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2751 && validate_dot(CHILD(tree, 2)));
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2752 if (nch == 1) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2753 if (TYPE(CHILD(tree, 0)) == test)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2754 res = validate_test(CHILD(tree, 0));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2755 else
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2756 res = validate_colon(CHILD(tree, 0));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2757 return (res);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2758 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2759 /* Must be [test] ':' [test] [sliceop],
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2760 * but at least one of the optional components will
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2761 * be present, but we don't know which yet.
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2762 */
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2763 if ((TYPE(CHILD(tree, 0)) != COLON) \|\| (nch == 4)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2764 res = validate_test(CHILD(tree, 0));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2765 offset = 1;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2766 }
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2767 if (res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2768 res = validate_colon(CHILD(tree, offset));
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2769 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2770 int rem = nch - ++offset;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2771 if (rem) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2772 if (TYPE(CHILD(tree, offset)) == test) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2773 res = validate_test(CHILD(tree, offset));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2774 ++offset;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2775 --rem;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2776 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2777 if (res && rem)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2778 res = validate_sliceop(CHILD(tree, offset));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2779 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2780 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2781 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2782 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2783
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2784
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2785 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2786 validate_sliceop(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2787 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2788 int nch = NCH(tree);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2789 int res = ((nch == 1) \|\| validate_numnodes(tree, 2, "sliceop"))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2790 && validate_ntype(tree, sliceop);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2791 if (!res && !PyErr_Occurred()) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2792 res = validate_numnodes(tree, 1, "sliceop");
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2793 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2794 if (res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2795 res = validate_colon(CHILD(tree, 0));
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2796 if (res && (nch == 2))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2797 res = validate_test(CHILD(tree, 1));
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2798
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2799 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2800 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2801
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2802
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2803 static int
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2804 validate_test_or_star_expr(node *n)
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2805 {
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2806 if (TYPE(n) == test)
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2807 return validate_test(n);
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2808 return validate_star_expr(n);
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2809 }
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2810
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2811 static int
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2812 validate_expr_or_star_expr(node *n)
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2813 {
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2814 if (TYPE(n) == expr)
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2815 return validate_expr(n);
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2816 return validate_star_expr(n);
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2817 }
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2818
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2819
7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2820 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2821 validate_exprlist(node *tree)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2822 {
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2823 return (validate_repeating_list(tree, exprlist,
56237 7ee140b7ef93 fix an ambiguity in the grammar from the implementation of extended unpacking Benjamin Peterson <benjamin@python.org> parents: 54338 diff changeset	2824 validate_expr_or_star_expr, "exprlist"));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2825 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2826
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2827
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2828 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2829 validate_dictorsetmaker(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2830 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2831 int nch = NCH(tree);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2832 int res = (validate_ntype(tree, dictorsetmaker)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2833 && (nch >= 3)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2834 && validate_test(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2835 && validate_colon(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2836 && validate_test(CHILD(tree, 2)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2837
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2838 if (res && ((nch % 4) == 0))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2839 res = validate_comma(CHILD(tree, --nch));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2840 else if (res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2841 res = ((nch % 4) == 3);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2842
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2843 if (res && (nch > 3)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2844 int pos = 3;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2845 /* ( ',' test ':' test )* */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2846 while (res && (pos < nch)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2847 res = (validate_comma(CHILD(tree, pos))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2848 && validate_test(CHILD(tree, pos + 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2849 && validate_colon(CHILD(tree, pos + 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2850 && validate_test(CHILD(tree, pos + 3)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2851 pos += 4;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2852 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2853 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2854 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2855 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2856
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2857
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2858 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2859 validate_eval_input(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2860 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2861 int pos;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2862 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2863 int res = (validate_ntype(tree, eval_input)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2864 && (nch >= 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2865 && validate_testlist(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2866 && validate_ntype(CHILD(tree, nch - 1), ENDMARKER));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2867
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2868 for (pos = 1; res && (pos < (nch - 1)); ++pos)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2869 res = validate_ntype(CHILD(tree, pos), NEWLINE);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2870
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2871 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2872 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2873
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2874
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2875 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2876 validate_node(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2877 {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2878 int nch = 0; /* num. children on current node */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2879 int res = 1; /* result value */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2880 node* next = 0; /* node to process after this one */
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2881
18247 e3cf3348feca Properly use &&. Closes bug #434989. Martin v. Löwis <martin@v.loewis.de> parents: 15751 diff changeset	2882 while (res && (tree != 0)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2883 nch = NCH(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2884 next = 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2885 switch (TYPE(tree)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2886 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2887 * Definition nodes.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2888 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2889 case funcdef:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2890 res = validate_funcdef(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2891 break;
49908 ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2892 case with_stmt:
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2893 res = validate_with_stmt(tree);
ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49633 diff changeset	2894 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2895 case classdef:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2896 res = validate_class(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2897 break;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2898 case decorated:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2899 res = validate_decorated(tree);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2900 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2901 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2902 * "Trivial" parse tree nodes.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2903 * (Why did I call these trivial?)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2904 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2905 case stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2906 res = validate_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2907 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2908 case small_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2909 /*
40774 793e0323d4d6 Essential changes for print function changes. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	2910 * expr_stmt \| del_stmt \| pass_stmt \| flow_stmt
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39701 diff changeset	2911 * \| import_stmt \| global_stmt \| assert_stmt
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2912 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2913 res = validate_small_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2914 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2915 case flow_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2916 res = (validate_numnodes(tree, 1, "flow_stmt")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2917 && ((TYPE(CHILD(tree, 0)) == break_stmt)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2918 \|\| (TYPE(CHILD(tree, 0)) == continue_stmt)
18646 c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	2919 \|\| (TYPE(CHILD(tree, 0)) == yield_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2920 \|\| (TYPE(CHILD(tree, 0)) == return_stmt)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2921 \|\| (TYPE(CHILD(tree, 0)) == raise_stmt)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2922 if (res)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2923 next = CHILD(tree, 0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2924 else if (nch == 1)
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	2925 err_string("illegal flow_stmt type");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2926 break;
18646 c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	2927 case yield_stmt:
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	2928 res = validate_yield_stmt(tree);
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	2929 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2930 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2931 * Compound statements.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2932 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2933 case simple_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2934 res = validate_simple_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2935 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2936 case compound_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2937 res = validate_compound_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2938 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2939 /*
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	2940 * Fundamental statements.
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2941 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2942 case expr_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2943 res = validate_expr_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2944 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2945 case del_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2946 res = validate_del_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2947 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2948 case pass_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2949 res = (validate_numnodes(tree, 1, "pass")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2950 && validate_name(CHILD(tree, 0), "pass"));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2951 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2952 case break_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2953 res = (validate_numnodes(tree, 1, "break")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2954 && validate_name(CHILD(tree, 0), "break"));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2955 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2956 case continue_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2957 res = (validate_numnodes(tree, 1, "continue")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2958 && validate_name(CHILD(tree, 0), "continue"));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2959 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2960 case return_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2961 res = validate_return_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2962 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2963 case raise_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2964 res = validate_raise_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2965 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2966 case import_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2967 res = validate_import_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2968 break;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2969 case import_name:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2970 res = validate_import_name(tree);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2971 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2972 case import_from:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2973 res = validate_import_from(tree);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	2974 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2975 case global_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2976 res = validate_global_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2977 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2978 case assert_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2979 res = validate_assert_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2980 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2981 case if_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2982 res = validate_if(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2983 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2984 case while_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2985 res = validate_while(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2986 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2987 case for_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2988 res = validate_for(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2989 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2990 case try_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2991 res = validate_try(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2992 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2993 case suite:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2994 res = validate_suite(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2995 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2996 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2997 * Expression nodes.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2998 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2999 case testlist:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3000 res = validate_testlist(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3001 break;
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	3002 case yield_expr:
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	3003 res = validate_yield_expr(tree);
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	3004 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3005 case test:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3006 res = validate_test(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3007 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3008 case and_test:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3009 res = validate_and_test(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3010 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3011 case not_test:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3012 res = validate_not_test(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3013 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3014 case comparison:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3015 res = validate_comparison(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3016 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3017 case exprlist:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3018 res = validate_exprlist(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3019 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3020 case comp_op:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3021 res = validate_comp_op(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3022 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3023 case expr:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3024 res = validate_expr(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3025 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3026 case xor_expr:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3027 res = validate_xor_expr(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3028 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3029 case and_expr:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3030 res = validate_and_expr(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3031 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3032 case shift_expr:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3033 res = validate_shift_expr(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3034 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3035 case arith_expr:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3036 res = validate_arith_expr(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3037 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3038 case term:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3039 res = validate_term(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3040 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3041 case factor:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3042 res = validate_factor(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3043 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3044 case power:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3045 res = validate_power(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3046 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3047 case atom:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3048 res = validate_atom(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3049 break;
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3050
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3051 default:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3052 /* Hopefully never reached! */
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	3053 err_string("unrecognized node type");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3054 res = 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3055 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3056 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3057 tree = next;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3058 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3059 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3060 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3061
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3062
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	3063 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3064 validate_expr_tree(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3065 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3066 int res = validate_eval_input(tree);
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3067
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3068 if (!res && !PyErr_Occurred())
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	3069 err_string("could not validate expression tuple");
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3070
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3071 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3072 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3073
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3074
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3075 /* file_input:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3076 * (NEWLINE \| stmt)* ENDMARKER
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3077 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	3078 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3079 validate_file_input(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3080 {
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3081 int j;
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3082 int nch = NCH(tree) - 1;
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3083 int res = ((nch >= 0)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3084 && validate_ntype(CHILD(tree, nch), ENDMARKER));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3085
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3086 for (j = 0; res && (j < nch); ++j) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3087 if (TYPE(CHILD(tree, j)) == stmt)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3088 res = validate_stmt(CHILD(tree, j));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3089 else
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3090 res = validate_newline(CHILD(tree, j));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3091 }
13620 5b727ab37092 Spelling fixes supplied by Rob W. W. Hooft. All these are fixes in either Thomas Wouters <thomas@python.org> parents: 13576 diff changeset	3092 /* This stays in to prevent any internal failures from getting to the
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3093 * user. Hopefully, this won't be needed. If a user reports getting
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3094 * this, we have some debugging to do.
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3095 */
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3096 if (!res && !PyErr_Occurred())
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	3097 err_string("VALIDATION FAILURE: report this to the maintainer!");
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3098
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3099 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3100 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3101
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3102 static int
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3103 validate_encoding_decl(node *tree)
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3104 {
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3105 int nch = NCH(tree);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3106 int res = ((nch == 1)
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3107 && validate_file_input(CHILD(tree, 0)));
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3108
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3109 if (!res && !PyErr_Occurred())
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3110 err_string("Error Parsing encoding_decl");
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3111
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3112 return res;
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3113 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3114
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3115 static PyObject*
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3116 pickle_constructor = NULL;
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3117
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3118
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3119 static PyObject*
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3120 parser__pickler(PyObject self, PyObject args)
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3121 {
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	3122 NOTE(ARGUNUSED(self))
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3123 PyObject *result = NULL;
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3124 PyObject *st = NULL;
11297 2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	3125 PyObject *empty_dict = NULL;
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3126
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3127 if (PyArg_ParseTuple(args, "O!:_pickler", &PyST_Type, &st)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3128 PyObject *newargs;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3129 PyObject *tuple;
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3130
11297 2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	3131 if ((empty_dict = PyDict_New()) == NULL)
2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	3132 goto finally;
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3133 if ((newargs = Py_BuildValue("Oi", st, 1)) == NULL)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3134 goto finally;
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3135 tuple = parser_st2tuple((PyST_Object*)NULL, newargs, empty_dict);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3136 if (tuple != NULL) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3137 result = Py_BuildValue("O(O)", pickle_constructor, tuple);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3138 Py_DECREF(tuple);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3139 }
11297 2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	3140 Py_DECREF(empty_dict);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3141 Py_DECREF(newargs);
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3142 }
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3143 finally:
11297 2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	3144 Py_XDECREF(empty_dict);
2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	3145
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3146 return (result);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3147 }
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3148
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3149
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3150 /* Functions exported by this module. Most of this should probably
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3151 * be converted into an ST object with methods, but that is better
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3152 * done directly in Python, allowing subclasses to be created directly.
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3153 * We'd really have to write a wrapper around it all anyway to allow
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3154 * inheritance.
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3155 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3156 static PyMethodDef parser_functions[] = {
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3157 {"compilest", (PyCFunction)parser_compilest, PUBLIC_METHOD_TYPE,
24796 de71e6fe64b0 Allow more docstrings to be removed during compilation in some modules Neal Norwitz <nnorwitz@gmail.com> parents: 24363 diff changeset	3158 PyDoc_STR("Compiles an ST object into a code object.")},
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3159 {"expr", (PyCFunction)parser_expr, PUBLIC_METHOD_TYPE,
24796 de71e6fe64b0 Allow more docstrings to be removed during compilation in some modules Neal Norwitz <nnorwitz@gmail.com> parents: 24363 diff changeset	3160 PyDoc_STR("Creates an ST object from an expression.")},
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3161 {"isexpr", (PyCFunction)parser_isexpr, PUBLIC_METHOD_TYPE,
24796 de71e6fe64b0 Allow more docstrings to be removed during compilation in some modules Neal Norwitz <nnorwitz@gmail.com> parents: 24363 diff changeset	3162 PyDoc_STR("Determines if an ST object was created from an expression.")},
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3163 {"issuite", (PyCFunction)parser_issuite, PUBLIC_METHOD_TYPE,
24796 de71e6fe64b0 Allow more docstrings to be removed during compilation in some modules Neal Norwitz <nnorwitz@gmail.com> parents: 24363 diff changeset	3164 PyDoc_STR("Determines if an ST object was created from a suite.")},
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3165 {"suite", (PyCFunction)parser_suite, PUBLIC_METHOD_TYPE,
24796 de71e6fe64b0 Allow more docstrings to be removed during compilation in some modules Neal Norwitz <nnorwitz@gmail.com> parents: 24363 diff changeset	3166 PyDoc_STR("Creates an ST object from a suite.")},
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3167 {"sequence2st", (PyCFunction)parser_tuple2st, PUBLIC_METHOD_TYPE,
24796 de71e6fe64b0 Allow more docstrings to be removed during compilation in some modules Neal Norwitz <nnorwitz@gmail.com> parents: 24363 diff changeset	3168 PyDoc_STR("Creates an ST object from a tree representation.")},
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3169 {"st2tuple", (PyCFunction)parser_st2tuple, PUBLIC_METHOD_TYPE,
24796 de71e6fe64b0 Allow more docstrings to be removed during compilation in some modules Neal Norwitz <nnorwitz@gmail.com> parents: 24363 diff changeset	3170 PyDoc_STR("Creates a tuple-tree representation of an ST.")},
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3171 {"st2list", (PyCFunction)parser_st2list, PUBLIC_METHOD_TYPE,
24796 de71e6fe64b0 Allow more docstrings to be removed during compilation in some modules Neal Norwitz <nnorwitz@gmail.com> parents: 24363 diff changeset	3172 PyDoc_STR("Creates a list-tree representation of an ST.")},
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3173 {"tuple2st", (PyCFunction)parser_tuple2st, PUBLIC_METHOD_TYPE,
24796 de71e6fe64b0 Allow more docstrings to be removed during compilation in some modules Neal Norwitz <nnorwitz@gmail.com> parents: 24363 diff changeset	3174 PyDoc_STR("Creates an ST object from a tree representation.")},
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3175
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3176 /* private stuff: support pickle module */
19274 5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3177 {"_pickler", (PyCFunction)parser__pickler, METH_VARARGS,
24796 de71e6fe64b0 Allow more docstrings to be removed during compilation in some modules Neal Norwitz <nnorwitz@gmail.com> parents: 24363 diff changeset	3178 PyDoc_STR("Returns the pickle magic to allow ST objects to be pickled.")},
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3179
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	3180 {NULL, NULL, 0, NULL}
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3181 };
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3182
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3183
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3184
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3185 static struct PyModuleDef parsermodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	3186 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	3187 "parser",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	3188 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	3189 -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	3190 parser_functions,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	3191 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	3192 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	3193 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	3194 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3195 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3196
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3197 PyMODINIT_FUNC PyInit_parser(void); /* supply a prototype */
24363 979ff5d0ae07 Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link Mark Hammond <mhammond@skippinet.com.au> parents: 24280 diff changeset	3198
979ff5d0ae07 Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link Mark Hammond <mhammond@skippinet.com.au> parents: 24280 diff changeset	3199 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3200 PyInit_parser(void)
14214 b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	3201 {
19274 5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3202 PyObject module, copyreg;
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3203
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	3204 if (PyType_Ready(&PyST_Type) < 0)
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	3205 return NULL;
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3206 module = PyModule_Create(&parsermodule);
36324 1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 35999 diff changeset	3207 if (module == NULL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56237 diff changeset	3208 return NULL;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3209
11266 c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	3210 if (parser_error == 0)
c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	3211 parser_error = PyErr_NewException("parser.ParserError", NULL, NULL);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3212
29952 1cbc6b7836dc Merge 23c1-branch back into the head. Barry will send email about the Tim Peters <tim.peters@gmail.com> parents: 28551 diff changeset	3213 if (parser_error == 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3214 return NULL;
29952 1cbc6b7836dc Merge 23c1-branch back into the head. Barry will send email about the Tim Peters <tim.peters@gmail.com> parents: 28551 diff changeset	3215 /* CAUTION: The code next used to skip bumping the refcount on
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3216 * parser_error. That's a disaster if PyInit_parser() gets called more
29952 1cbc6b7836dc Merge 23c1-branch back into the head. Barry will send email about the Tim Peters <tim.peters@gmail.com> parents: 28551 diff changeset	3217 * than once. By incref'ing, we ensure that each module dict that
1cbc6b7836dc Merge 23c1-branch back into the head. Barry will send email about the Tim Peters <tim.peters@gmail.com> parents: 28551 diff changeset	3218 * gets created owns its reference to the shared parser_error object,
1cbc6b7836dc Merge 23c1-branch back into the head. Barry will send email about the Tim Peters <tim.peters@gmail.com> parents: 28551 diff changeset	3219 * and the file static parser_error vrbl owns a reference too.
1cbc6b7836dc Merge 23c1-branch back into the head. Barry will send email about the Tim Peters <tim.peters@gmail.com> parents: 28551 diff changeset	3220 */
1cbc6b7836dc Merge 23c1-branch back into the head. Barry will send email about the Tim Peters <tim.peters@gmail.com> parents: 28551 diff changeset	3221 Py_INCREF(parser_error);
1cbc6b7836dc Merge 23c1-branch back into the head. Barry will send email about the Tim Peters <tim.peters@gmail.com> parents: 28551 diff changeset	3222 if (PyModule_AddObject(module, "ParserError", parser_error) != 0)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3223 return NULL;
29952 1cbc6b7836dc Merge 23c1-branch back into the head. Barry will send email about the Tim Peters <tim.peters@gmail.com> parents: 28551 diff changeset	3224
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3225 Py_INCREF(&PyST_Type);
19274 5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3226 PyModule_AddObject(module, "STType", (PyObject*)&PyST_Type);
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3227
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3228 PyModule_AddStringConstant(module, "__copyright__",
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3229 parser_copyright_string);
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3230 PyModule_AddStringConstant(module, "__doc__",
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3231 parser_doc_string);
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3232 PyModule_AddStringConstant(module, "__version__",
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3233 parser_version_string);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3234
18748 e5bafddd1da0 Elaborate a comment. Fred Drake <fdrake@acm.org> parents: 18669 diff changeset	3235 /* Register to support pickling.
e5bafddd1da0 Elaborate a comment. Fred Drake <fdrake@acm.org> parents: 18669 diff changeset	3236 * If this fails, the import of this module will fail because an
e5bafddd1da0 Elaborate a comment. Fred Drake <fdrake@acm.org> parents: 18669 diff changeset	3237 * exception will be raised here; should we clear the exception?
e5bafddd1da0 Elaborate a comment. Fred Drake <fdrake@acm.org> parents: 18669 diff changeset	3238 */
46867 dd5513b472dc Rename copy_reg module to copyreg. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46644 diff changeset	3239 copyreg = PyImport_ImportModuleNoBlock("copyreg");
19274 5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3240 if (copyreg != NULL) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3241 PyObject func, pickler;
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3242
19274 5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3243 func = PyObject_GetAttrString(copyreg, "pickle");
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3244 pickle_constructor = PyObject_GetAttrString(module, "sequence2st");
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3245 pickler = PyObject_GetAttrString(module, "_pickler");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3246 Py_XINCREF(pickle_constructor);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3247 if ((func != NULL) && (pickle_constructor != NULL)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3248 && (pickler != NULL)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3249 PyObject *res;
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3250
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3251 res = PyObject_CallFunctionObjArgs(func, &PyST_Type, pickler,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3252 pickle_constructor, NULL);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3253 Py_XDECREF(res);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3254 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3255 Py_XDECREF(func);
19274 5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3256 Py_XDECREF(pickle_constructor);
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3257 Py_XDECREF(pickler);
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3258 Py_DECREF(copyreg);
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3259 }
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3260 return module;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3261 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/parsermodule.c @ 68043:cd14782886ca 3.2