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

annotate Modules/parsermodule.c @ 62789:692b7989cd92 3.1

Merged revisions 82552-82553 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82552 | mark.dickinson | 2010-07-04 19:11:51 +0100 (Sun, 04 Jul 2010) | 2 lines Issue #9130: Fix validation of relative imports in parser module. ........ r82553 | mark.dickinson | 2010-07-04 19:15:26 +0100 (Sun, 04 Jul 2010) | 1 line Fix symbol numbers in test_parser test. ........

author	Mark Dickinson <dickinsm@gmail.com>
date	Sun, 04 Jul 2010 18:16:43 +0000
parents	18282039c5c9
children	3aa22428582a

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 #include "compile.h"
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	38 #undef Yield
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	39 #include "ast.h"
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	40 #include "pyarena.h"
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	41
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	42 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	43
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	44 #ifdef lint
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	45 #include <note.h>
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	46 #else
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	47 #define NOTE(x)
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	48 #endif
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	49
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	50 /* String constants used to initialize module attributes.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	51 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	52 */
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23538 diff changeset	53 static char parser_copyright_string[] =
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23538 diff changeset	54 "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	55 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	56 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	57 Centrum, Amsterdam, The Netherlands.";
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	58
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	59
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23538 diff changeset	60 PyDoc_STRVAR(parser_doc_string,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23538 diff changeset	61 "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	62
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23538 diff changeset	63 static char parser_version_string[] = "0.5";
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	64
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	65
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	66 typedef PyObject* (*SeqMaker) (Py_ssize_t length);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	67 typedef int (SeqInserter) (PyObject sequence,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	68 Py_ssize_t index,
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	69 PyObject* element);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	70
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	71 /* 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	72 * 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	73 * 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	74 * 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	75 * 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	76 * 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	77 * 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	78 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	79
1406 474823e5f7dc * parsermodule.c, Makefile, config.c: rudimentary interface to the Python Guido van Rossum <guido@python.org> parents: diff changeset	80
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	81 static PyObject*
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	82 node2tuple(node n, / node to convert */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	83 SeqMaker mkseq, /* create sequence */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	84 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	85 int lineno, /* include line numbers? */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	86 int col_offset) /* include column offsets? */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	87 {
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	88 if (n == NULL) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	89 Py_INCREF(Py_None);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	90 return (Py_None);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	91 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	92 if (ISNONTERMINAL(TYPE(n))) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	93 int i;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	94 PyObject *v;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	95 PyObject *w;
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	96
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 24796 diff changeset	97 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	98 if (v == NULL)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	99 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	100 w = PyLong_FromLong(TYPE(n));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	101 if (w == NULL) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	102 Py_DECREF(v);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	103 return ((PyObject*) NULL);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	104 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	105 (void) addelem(v, 0, w);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	106 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	107 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	108 if (w == NULL) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	109 Py_DECREF(v);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	110 return ((PyObject*) NULL);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	111 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	112 (void) addelem(v, i+1, w);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	113 }
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	114
26979 784e7fdf8c52 SF patch [ 597919 ] compiler package and SET_LINENO Jeremy Hylton <jeremy@alum.mit.edu> parents: 24796 diff changeset	115 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	116 (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	117 return (v);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	118 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	119 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	120 PyObject *result = mkseq(2 + lineno + col_offset);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	121 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	122 (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	123 (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	124 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	125 (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	126 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	127 (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	128 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	129 return (result);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	130 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	131 else {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	132 PyErr_SetString(PyExc_SystemError,
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	133 "unrecognized parse tree node type");
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	134 return ((PyObject*) NULL);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	135 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	136 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	137 /*
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	138 * 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	139 */
1406 474823e5f7dc * parsermodule.c, Makefile, config.c: rudimentary interface to the Python Guido van Rossum <guido@python.org> parents: diff changeset	140
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	141
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	142
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	143 /* 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	144 * '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	145 * 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	146 * 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	147 * 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	148 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	149
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	150 #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	151 #define PyST_SUITE 2
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	152
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	153
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	154 /* 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	155 * 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	156 * 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	157 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	158
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	159 static PyObject*
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	160 parser_error = 0;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	161
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	162
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 typedef struct {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	164 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	165 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	166 int st_type; /* EXPR or SUITE ? */
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	167 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	168 } PyST_Object;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	169
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	170
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	171 static void parser_free(PyST_Object *st);
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	172 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	173 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	174 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	175 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	176 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	177 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	178
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	179 #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	180
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	181 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	182 {"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	183 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	184 {"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	185 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	186 {"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	187 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	188 {"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	189 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	190 {"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	191 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	192
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	193 {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	194 };
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	195
885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	196 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	197 PyTypeObject PyST_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41824 diff changeset	198 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	199 "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	200 (int) sizeof(PyST_Object), /* tp_basicsize */
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	201 0, /* tp_itemsize */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	202 (destructor)parser_free, /* tp_dealloc */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	203 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	204 0, /* tp_getattr */
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	205 0, /* tp_setattr */
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51244 diff changeset	206 0, /* tp_reserved */
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	207 0, /* tp_repr */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	208 0, /* tp_as_number */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	209 0, /* tp_as_sequence */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	210 0, /* tp_as_mapping */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	211 0, /* tp_hash */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	212 0, /* tp_call */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	213 0, /* tp_str */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	214 0, /* tp_getattro */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	215 0, /* tp_setattro */
5613 190e35bbc15a Add doc string to type object. Fred Drake <fdrake@acm.org> parents: 5236 diff changeset	216
190e35bbc15a Add doc string to type object. Fred Drake <fdrake@acm.org> parents: 5236 diff changeset	217 /* 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	218 0, /* tp_as_buffer */
5613 190e35bbc15a Add doc string to type object. Fred Drake <fdrake@acm.org> parents: 5236 diff changeset	219
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	220 Py_TPFLAGS_DEFAULT, /* tp_flags */
5613 190e35bbc15a Add doc string to type object. Fred Drake <fdrake@acm.org> parents: 5236 diff changeset	221
190e35bbc15a Add doc string to type object. Fred Drake <fdrake@acm.org> parents: 5236 diff changeset	222 /* __doc__ */
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	223 "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	224 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	225 0, /* tp_clear */
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	226 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	227 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	228 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	229 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	230 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	231 }; /* PyST_Type */
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	232
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	233
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	234 /* 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	235 #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	236
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	237 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	238 parser_compare_nodes(node left, node right)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	239 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	240 int j;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	241
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	242 if (TYPE(left) < TYPE(right))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	243 return (-1);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	244
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	245 if (TYPE(right) < TYPE(left))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	246 return (1);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	247
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	248 if (ISTERMINAL(TYPE(left)))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	249 return (strcmp(STR(left), STR(right)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	250
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	251 if (NCH(left) < NCH(right))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	252 return (-1);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	253
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	254 if (NCH(right) < NCH(left))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	255 return (1);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	256
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	257 for (j = 0; j < NCH(left); ++j) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	258 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	259
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	260 if (v != 0)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	261 return (v);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	262 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	263 return (0);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	264 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	265
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	266 /* 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	267 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	268 * Comparison function used by the Python operators ==, !=, <, >, <=, >=
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	269 * 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	270 * checks and protection code.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	271 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	272 */
51244 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 #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	275
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	276 static PyObject *
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	277 parser_richcompare(PyObject left, PyObject right, int op)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	278 {
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	279 int result;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	280 PyObject *v;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	281
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	282 /* 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	283 if (left == NULL \|\| right == NULL) {
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	284 PyErr_BadInternalCall();
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	285 return NULL;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	286 }
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	287
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	288 /* both arguments should be instances of PyST_Object */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	289 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	290 v = Py_NotImplemented;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	291 goto finished;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	292 }
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	293
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	294 if (left == right)
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	295 /* if arguments are identical, they're equal */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	296 result = 0;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	297 else
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	298 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	299 ((PyST_Object *)right)->st_node);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	300
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	301 /* Convert return value to a Boolean */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	302 switch (op) {
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	303 case Py_EQ:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	304 v = TEST_COND(result == 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	305 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	306 case Py_NE:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	307 v = TEST_COND(result != 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	308 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	309 case Py_LE:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	310 v = TEST_COND(result <= 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	311 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	312 case Py_GE:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	313 v = TEST_COND(result >= 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	314 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	315 case Py_LT:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	316 v = TEST_COND(result < 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	317 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	318 case Py_GT:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	319 v = TEST_COND(result > 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	320 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	321 default:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	322 PyErr_BadArgument();
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	323 return NULL;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	324 }
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	325 finished:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	326 Py_INCREF(v);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 50079 diff changeset	327 return v;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	328 }
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 /* parser_newstobject(node* st)
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	331 *
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	332 * 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	333 * '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	334 * Python code.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	335 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	336 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	337 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	338 parser_newstobject(node *st, int type)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	339 {
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	340 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	341
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	342 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	343 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	344 o->st_type = type;
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	345 o->st_flags.cf_flags = 0;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	346 }
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	347 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	348 PyNode_Free(st);
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	349 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	350 return ((PyObject*)o);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	351 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	352
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	353
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	354 /* void parser_free(PyST_Object* st)
3200 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 * 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	357 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	358 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	359 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	360 parser_free(PyST_Object *st)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	361 {
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	362 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	363 PyObject_Del(st);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	364 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	365
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	366
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	367 /* 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	368 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	369 * 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	370 * 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	371 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	372 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	373 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	374 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	375 {
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	376 PyObject *line_option = 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	377 PyObject *col_option = 0;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	378 PyObject *res = 0;
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	379 int ok;
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	380
48558 fcbd9f4f095c Remove "ast" aliases from the parser module. Georg Brandl <georg@python.org> parents: 48413 diff changeset	381 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	382
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	383 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	384 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	385 &PyST_Type, &self, &line_option,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	386 &col_option);
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	387 }
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	388 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	389 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	390 &line_option, &col_option);
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	391 if (ok != 0) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	392 int lineno = 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	393 int col_offset = 0;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	394 if (line_option != NULL) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	395 lineno = (PyObject_IsTrue(line_option) != 0) ? 1 : 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	396 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	397 if (col_option != NULL) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	398 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	399 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	400 /*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	401 * 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	402 * since it's known to work already.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	403 */
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	404 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	405 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	406 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	407 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	408 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	409
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	410
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	411 /* parser_st2list(PyObject* self, PyObject* args, PyObject* kw)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	412 *
11297 2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	413 * 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	414 * 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	415 *
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	416 */
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	417 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	418 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	419 {
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	420 PyObject *line_option = 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	421 PyObject *col_option = 0;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	422 PyObject *res = 0;
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	423 int ok;
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	424
48558 fcbd9f4f095c Remove "ast" aliases from the parser module. Georg Brandl <georg@python.org> parents: 48413 diff changeset	425 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	426
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	427 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	428 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	429 &PyST_Type, &self, &line_option,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	430 &col_option);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	431 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	432 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	433 &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	434 if (ok) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	435 int lineno = 0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	436 int col_offset = 0;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	437 if (line_option != 0) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	438 lineno = PyObject_IsTrue(line_option) ? 1 : 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	439 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	440 if (col_option != NULL) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	441 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	442 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	443 /*
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	444 * 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	445 * since it's known to work already.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	446 */
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	447 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	448 PyList_New, PyList_SetItem, lineno, col_offset);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	449 }
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	450 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	451 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	452
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	453
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	454 /* parser_compilest(PyObject* self, PyObject* args)
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	455 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	456 * 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	457 * 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	458 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	459 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	460 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	461 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	462 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	463 PyObject* res = 0;
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	464 PyArena* arena;
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	465 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	466 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	467 int ok;
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	468
48558 fcbd9f4f095c Remove "ast" aliases from the parser module. Georg Brandl <georg@python.org> parents: 48413 diff changeset	469 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	470
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	471 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	472 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	473 &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	474 else
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	475 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	476 &str);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	477
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	478 if (ok) {
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	479 arena = PyArena_New();
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	480 if (arena) {
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	481 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	482 if (mod) {
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	483 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	484 }
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	485 PyArena_Free(arena);
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	486 }
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	487 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	488
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	489 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	490 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	491
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	492
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	493 /* PyObject* parser_isexpr(PyObject* self, PyObject* args)
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	494 * PyObject* parser_issuite(PyObject* self, PyObject* args)
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	495 *
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	496 * 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	497 * 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	498 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	499 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	500 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	501 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	502 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	503 PyObject* res = 0;
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	504 int ok;
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	505
48558 fcbd9f4f095c Remove "ast" aliases from the parser module. Georg Brandl <georg@python.org> parents: 48413 diff changeset	506 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	507
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	508 if (self == NULL \|\| PyModule_Check(self))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	509 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	510 &PyST_Type, &self);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	511 else
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	512 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	513
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	514 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	515 /* 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	516 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	517 Py_INCREF(res);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	518 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	519 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	520 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	521
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	522
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	523 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	524 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	525 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	526 PyObject* res = 0;
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	527 int ok;
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	528
48558 fcbd9f4f095c Remove "ast" aliases from the parser module. Georg Brandl <georg@python.org> parents: 48413 diff changeset	529 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	530
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	531 if (self == NULL \|\| PyModule_Check(self))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	532 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	533 &PyST_Type, &self);
8039 a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	534 else
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	535 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	536
a38550613af3 The documentation threatened it would happen -- the functions that should Fred Drake <fdrake@acm.org> parents: 8034 diff changeset	537 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	538 /* 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	539 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	540 Py_INCREF(res);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	541 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	542 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	543 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	544
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	545
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	546 /* err_string(char* message)
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 * 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	549 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	550 */
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	551 static void
13503 6484098f40fc ANSI-fying Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13466 diff changeset	552 err_string(char *message)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	553 {
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	554 PyErr_SetString(parser_error, message);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	555 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	556
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	557
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	558 /* 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	559 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	560 * 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	561 * 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	562 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	563 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	564 static PyObject*
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	565 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	566 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	567 char* string = 0;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	568 PyObject* res = 0;
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	569 int flags = 0;
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	570 perrdetail err;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	571
36680 54eb5b1fb363 unconst. Martin v. Löwis <martin@v.loewis.de> parents: 36673 diff changeset	572 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	573
c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	574 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	575 node* n = PyParser_ParseStringFlagsFilenameEx(string, NULL,
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	576 &_PyParser_Grammar,
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	577 (type == PyST_EXPR)
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	578 ? eval_input : file_input,
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	579 &err, &flags);
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	580
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	581 if (n) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	582 res = parser_newstobject(n, type);
49624 f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	583 if (res)
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	584 ((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	585 }
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	586 else
f3234e43e1fe Merged revisions 67066 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48660 diff changeset	587 PyParser_SetError(&err);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	588 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	589 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	590 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	591
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	592
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	593 /* PyObject* parser_expr(PyObject* self, PyObject* args)
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	594 * PyObject* parser_suite(PyObject* self, PyObject* args)
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	595 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	596 * 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	597 * 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	598 * 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	599 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	600 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	601 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	602 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	603 {
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	604 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	605 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	606 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	607
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	608
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	609 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	610 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	611 {
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	612 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	613 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	614 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	615
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	616
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	617
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	618 /* 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	619 * 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	620 * 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	621 * 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	622 * 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	623 * 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	624 * phase, returning an exception instead.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	625 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	626 * 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	627 * 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	628 * 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	629 * 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	630 * 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	631 * 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	632 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	633
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	634
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	635 static node* build_node_tree(PyObject *tuple);
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	636 static int validate_expr_tree(node *tree);
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	637 static int validate_file_input(node *tree);
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	638 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	639
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	640 /* 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	641 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	642 * 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	643 * 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	644 * 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	645 * 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	646 * 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	647 * 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	648 *
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	649 * 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	650 * ST objects.
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	651 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	652 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	653 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	654 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	655 {
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	656 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	657 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	658 PyObject *tuple;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	659 node *tree;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	660
36680 54eb5b1fb363 unconst. Martin v. Löwis <martin@v.loewis.de> parents: 36673 diff changeset	661 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	662
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	663 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	664 &tuple))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	665 return (0);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	666 if (!PySequence_Check(tuple)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	667 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	668 "sequence2st() requires a single sequence argument");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	669 return (0);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	670 }
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 * 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	673 */
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	674 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	675 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	676 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	677 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	678 /* 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	679 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	680 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	681 else
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	682 PyNode_Free(tree);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	683 }
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	684 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	685 /* 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	686 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	687 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	688 else
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	689 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	690 }
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	691 else if (start_sym == encoding_decl) {
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	692 /* This looks like an encoding_decl so far. */
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	693 if (validate_encoding_decl(tree))
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	694 st = parser_newstobject(tree, PyST_SUITE);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	695 else
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	696 PyNode_Free(tree);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	697 }
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	698 else {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	699 /* 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	700 PyNode_Free(tree);
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	701 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	702 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	703 }
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	704 /* 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	705 * 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	706 */
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	707 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	708 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	709
6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	710 return st;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	711 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	712
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 /* node* build_node_children()
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	715 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	716 * 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	717 * 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	718 * 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	719 * and no memory will have been deallocated.
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	720 *
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	721 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	722 static node*
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	723 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	724 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	725 Py_ssize_t len = PyObject_Size(tuple);
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	726 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	727 int err;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	728
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	729 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	730 /* 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	731 PyObject* elem = PySequence_GetItem(tuple, i);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	732 int ok = elem != NULL;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	733 long type = 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	734 char *strn = 0;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	735
12416 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 ok = PySequence_Check(elem);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	738 if (ok) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	739 PyObject *temp = PySequence_GetItem(elem, 0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	740 if (temp == NULL)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	741 ok = 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	742 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	743 ok = PyLong_Check(temp);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	744 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	745 type = PyLong_AS_LONG(temp);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	746 Py_DECREF(temp);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	747 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	748 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	749 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	750 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	751 "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	752 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	753 Py_XDECREF(err);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	754 Py_XDECREF(elem);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	755 return (0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	756 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	757 if (ISTERMINAL(type)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	758 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	759 PyObject *temp;
42856 f3b3ffd13954 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42535 diff changeset	760 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	761
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	762 if ((len != 2) && (len != 3)) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	763 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	764 return 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	765 }
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	766 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	767 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	768 return 0;
42856 f3b3ffd13954 Use unicode and remove support for some uses of str8. Neal Norwitz <nnorwitz@gmail.com> parents: 42535 diff changeset	769 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	770 PyErr_Format(parser_error,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	771 "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	772 " 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	773 Py_TYPE(temp)->tp_name);
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12487 diff changeset	774 Py_DECREF(temp);
42535 8d6867cb8a8d Fix refleaks Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	775 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	776 return 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	777 }
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	778 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	779 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	780 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	781 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	782 *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	783 else {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	784 PyErr_Format(parser_error,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	785 "third item in terminal node must be an"
8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	786 " integer, found %s",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	787 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	788 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	789 Py_DECREF(temp);
42535 8d6867cb8a8d Fix refleaks Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	790 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	791 return 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	792 }
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	793 Py_DECREF(o);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	794 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	795 }
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48558 diff changeset	796 temp_str = _PyUnicode_AsStringAndSize(temp, &len);
46644 ea594306ea85 Issue #1950: Fixed misusage of PyUnicode_AsString(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44441 diff changeset	797 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	798 if (strn != NULL)
46644 ea594306ea85 Issue #1950: Fixed misusage of PyUnicode_AsString(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44441 diff changeset	799 (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	800 Py_DECREF(temp);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	801 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	802 else if (!ISNONTERMINAL(type)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	803 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	804 * 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	805 * Throw an exception.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	806 */
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	807 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	808 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	809 Py_XDECREF(err);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	810 Py_XDECREF(elem);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	811 return (0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	812 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36712 diff changeset	813 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	814 if (err == E_NOMEM) {
42535 8d6867cb8a8d Fix refleaks Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	815 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	816 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	817 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	818 }
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	819 if (err == E_OVERFLOW) {
42535 8d6867cb8a8d Fix refleaks Neal Norwitz <nnorwitz@gmail.com> parents: 42334 diff changeset	820 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	821 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	822 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	823 "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	824 return NULL;
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	825 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	826
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	827 if (ISNONTERMINAL(type)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	828 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	829
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	830 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	831 Py_XDECREF(elem);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	832 return (0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	833 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	834 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	835 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	836 ++(line_num); / line number after the newline! */
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 Py_XDECREF(elem);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	839 }
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	840 return root;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	841 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	842
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	843
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	844 static node*
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	845 build_node_tree(PyObject *tuple)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	846 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	847 node* res = 0;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	848 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	849 long num = -1;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	850
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	851 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	852 num = PyLong_AsLong(temp);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	853 Py_XDECREF(temp);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	854 if (ISTERMINAL(num)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	855 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	856 * 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	857 * 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	858 */
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	859 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	860 "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	861 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	862 Py_XDECREF(tuple);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	863 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	864 else if (ISNONTERMINAL(num)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	865 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	866 * Not efficient, but that can be handled later.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	867 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	868 int line_num = 0;
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	869 PyObject *encoding = NULL;
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	870
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	871 if (num == encoding_decl) {
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	872 encoding = PySequence_GetItem(tuple, 2);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	873 /* 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	874 tuple = PySequence_GetSlice(tuple, 0, 2);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	875 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	876 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	877 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	878 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	879 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	880 res = NULL;
42d0819546d6 Fix memory leak in the parser module: There were two leaks in Fred Drake <fdrake@acm.org> parents: 20432 diff changeset	881 }
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	882 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	883 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	884 const char *temp;
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48558 diff changeset	885 temp = _PyUnicode_AsStringAndSize(encoding, &len);
46644 ea594306ea85 Issue #1950: Fixed misusage of PyUnicode_AsString(). Alexandre Vassalotti <alexandre@peadrop.com> parents: 44441 diff changeset	886 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	887 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	888 (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	889 Py_DECREF(encoding);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	890 Py_DECREF(tuple);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	891 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	892 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	893 }
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	894 else {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	895 /* 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	896 * 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	897 * 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	898 */
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	899 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	900 "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	901 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	902 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	903 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	904
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	905 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	906 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	907
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	908
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	909 /*
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	910 * Validation routines used within the validation section:
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	911 */
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23832 diff changeset	912 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	913
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	914 #define validate_ampersand(ch) validate_terminal(ch, AMPER, "&")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	915 #define validate_circumflex(ch) validate_terminal(ch, CIRCUMFLEX, "^")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	916 #define validate_colon(ch) validate_terminal(ch, COLON, ":")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	917 #define validate_comma(ch) validate_terminal(ch, COMMA, ",")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	918 #define validate_dedent(ch) validate_terminal(ch, DEDENT, "")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	919 #define validate_equal(ch) validate_terminal(ch, EQUAL, "=")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	920 #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	921 #define validate_lparen(ch) validate_terminal(ch, LPAR, "(")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	922 #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	923 #define validate_rparen(ch) validate_terminal(ch, RPAR, ")")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	924 #define validate_semi(ch) validate_terminal(ch, SEMI, ";")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	925 #define validate_star(ch) validate_terminal(ch, STAR, "*")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	926 #define validate_vbar(ch) validate_terminal(ch, VBAR, "\|")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	927 #define validate_doublestar(ch) validate_terminal(ch, DOUBLESTAR, "**")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	928 #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	929 #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	930 #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	931
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	932 #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	933
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	934 VALIDATER(node); VALIDATER(small_stmt);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	935 VALIDATER(class); VALIDATER(node);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	936 VALIDATER(parameters); VALIDATER(suite);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	937 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	938 VALIDATER(vfpdef);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	939 VALIDATER(stmt); VALIDATER(simple_stmt);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	940 VALIDATER(expr_stmt); VALIDATER(power);
40774 793e0323d4d6 Essential changes for print function changes. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	941 VALIDATER(del_stmt);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	942 VALIDATER(return_stmt); VALIDATER(raise_stmt);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	943 VALIDATER(import_stmt); VALIDATER(import_stmt);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	944 VALIDATER(import_name); VALIDATER(yield_stmt);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	945 VALIDATER(global_stmt); VALIDATER(assert_stmt);
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	946 VALIDATER(compound_stmt);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	947 VALIDATER(while); VALIDATER(for);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	948 VALIDATER(try); VALIDATER(except_clause);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	949 VALIDATER(test); VALIDATER(and_test);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	950 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	951 VALIDATER(comp_op);
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	952 VALIDATER(star_expr); VALIDATER(expr);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	953 VALIDATER(xor_expr); VALIDATER(and_expr);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	954 VALIDATER(shift_expr); VALIDATER(arith_expr);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	955 VALIDATER(term); VALIDATER(factor);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	956 VALIDATER(atom); VALIDATER(lambdef);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	957 VALIDATER(trailer); VALIDATER(subscript);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	958 VALIDATER(subscriptlist); VALIDATER(sliceop);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	959 VALIDATER(exprlist); VALIDATER(dictorsetmaker);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	960 VALIDATER(arglist); VALIDATER(argument);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	961 VALIDATER(testlist1); VALIDATER(comp_for);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	962 VALIDATER(comp_iter); VALIDATER(comp_if);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	963 VALIDATER(testlist_comp); VALIDATER(yield_expr);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	964 VALIDATER(yield_or_testlist); VALIDATER(or_test);
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	965 VALIDATER(test_nocond); VALIDATER(lambdef_nocond);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	966
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	967 #undef VALIDATER
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	968
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	969 #define is_even(n) (((n) & 1) == 0)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	970 #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	971
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	972
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	973 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	974 validate_ntype(node *n, int t)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	975 {
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	976 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	977 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	978 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	979 return 0;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	980 }
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	981 return 1;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	982 }
3200 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
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	985 /* 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	986 * 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	987 * 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	988 * "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	989 * 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	990 * in that fashion.
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	991 */
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	992 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	993 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	994 {
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	995 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	996 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	997 "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	998 return 0;
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	999 }
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1000 return 1;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1001 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1002
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1003
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1004 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1005 validate_terminal(node terminal, int type, char string)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1006 {
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1007 int res = (validate_ntype(terminal, type)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1008 && ((string == 0) \|\| (strcmp(string, STR(terminal)) == 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1009
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1010 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	1011 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	1012 "Illegal terminal: expected \"%s\"", string);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1013 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1014 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1015 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1016
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1017
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1018 /* X (',' X) [',']
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1019 */
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1020 static int
13667 a6c7bfdd6777 Even more ANSIfication: fix as many function pointers and declarations as Thomas Wouters <thomas@python.org> parents: 13620 diff changeset	1021 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	1022 const char *const name)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1023 {
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1024 int nch = NCH(tree);
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1025 int res = (nch && validate_ntype(tree, ntype)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1026 && vfunc(CHILD(tree, 0)));
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1027
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1028 if (!res && !PyErr_Occurred())
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1029 (void) validate_numnodes(tree, 1, name);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1030 else {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1031 if (is_even(nch))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1032 res = validate_comma(CHILD(tree, --nch));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1033 if (res && nch > 1) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1034 int pos = 1;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1035 for ( ; res && pos < nch; pos += 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1036 res = (validate_comma(CHILD(tree, pos))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1037 && vfunc(CHILD(tree, pos + 1)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1038 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1039 }
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1040 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1041 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1042
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1043
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1044 /* validate_class()
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1045 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1046 * classdef:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1047 * 'class' NAME ['(' testlist ')'] ':' suite
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1048 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1049 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1050 validate_class(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1051 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1052 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	1053 int res = (validate_ntype(tree, classdef) &&
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1054 ((nch == 4) \|\| (nch == 6) \|\| (nch == 7)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1055
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1056 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1057 res = (validate_name(CHILD(tree, 0), "class")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1058 && validate_ntype(CHILD(tree, 1), NAME)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1059 && validate_colon(CHILD(tree, nch - 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1060 && validate_suite(CHILD(tree, nch - 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1061 }
34887 7c2780c9e51b Flush out support for ``class B(): pass`` syntax by adding support to the Brett Cannon <bcannon@gmail.com> parents: 33353 diff changeset	1062 else {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1063 (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	1064 }
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	1065
34887 7c2780c9e51b Flush out support for ``class B(): pass`` syntax by adding support to the Brett Cannon <bcannon@gmail.com> parents: 33353 diff changeset	1066 if (res) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1067 if (nch == 7) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1068 res = ((validate_lparen(CHILD(tree, 2)) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1069 validate_arglist(CHILD(tree, 3)) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1070 validate_rparen(CHILD(tree, 4))));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1071 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1072 else if (nch == 6) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1073 res = (validate_lparen(CHILD(tree,2)) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1074 validate_rparen(CHILD(tree,3)));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1075 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1076 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1077 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1078 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1079
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1080
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1081 /* if_stmt:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1082 * '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	1083 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1084 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1085 validate_if(node *tree)
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1086 {
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1087 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1088 int res = (validate_ntype(tree, if_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1089 && (nch >= 4)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1090 && validate_name(CHILD(tree, 0), "if")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1091 && validate_test(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1092 && validate_colon(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1093 && validate_suite(CHILD(tree, 3)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1094
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1095 if (res && ((nch % 4) == 3)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1096 /* ... 'else' ':' suite */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1097 res = (validate_name(CHILD(tree, nch - 3), "else")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1098 && validate_colon(CHILD(tree, nch - 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1099 && validate_suite(CHILD(tree, nch - 1)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1100 nch -= 3;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1101 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1102 else if (!res && !PyErr_Occurred())
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1103 (void) validate_numnodes(tree, 4, "if");
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1104 if ((nch % 4) != 0)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1105 /* Will catch the case for nch < 4 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1106 res = validate_numnodes(tree, 0, "if");
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1107 else if (res && (nch > 4)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1108 /* ... ('elif' test ':' suite)+ ... */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1109 int j = 4;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1110 while ((j < nch) && res) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1111 res = (validate_name(CHILD(tree, j), "elif")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1112 && validate_colon(CHILD(tree, j + 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1113 && validate_test(CHILD(tree, j + 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1114 && validate_suite(CHILD(tree, j + 3)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1115 j += 4;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1116 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1117 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1118 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1119 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1120
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1121
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1122 /* parameters:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1123 * '(' [varargslist] ')'
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1124 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1125 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1126 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1127 validate_parameters(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1128 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1129 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1130 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	1131
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1132 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1133 res = (validate_lparen(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1134 && validate_rparen(CHILD(tree, nch - 1)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1135 if (res && (nch == 3))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1136 res = validate_varargslist(CHILD(tree, 1));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1137 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1138 else {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1139 (void) validate_numnodes(tree, 2, "parameters");
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1140 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1141 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1142 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1143
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1144
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1145 /* validate_suite()
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1146 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1147 * suite:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1148 * simple_stmt
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1149 * \| NEWLINE INDENT stmt+ DEDENT
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1150 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1151 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1152 validate_suite(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1153 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1154 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1155 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	1156
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1157 if (res && (nch == 1))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1158 res = validate_simple_stmt(CHILD(tree, 0));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1159 else if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1160 /* NEWLINE INDENT stmt+ DEDENT */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1161 res = (validate_newline(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1162 && validate_indent(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1163 && validate_stmt(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1164 && validate_dedent(CHILD(tree, nch - 1)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1165
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1166 if (res && (nch > 4)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1167 int i = 3;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1168 --nch; /* forget the DEDENT */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1169 for ( ; res && (i < nch); ++i)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1170 res = validate_stmt(CHILD(tree, i));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1171 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1172 else if (nch < 4)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1173 res = validate_numnodes(tree, 4, "suite");
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1174 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1175 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1176 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1177
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1178
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1179 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1180 validate_testlist(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1181 {
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1182 return (validate_repeating_list(tree, testlist,
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1183 validate_test, "testlist"));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1184 }
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
20432 56141b86a7f2 Very subtle syntax change: in a list comprehension, the testlist in Guido van Rossum <guido@python.org> parents: 19274 diff changeset	1187 static int
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	1188 validate_testlist1(node *tree)
9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	1189 {
9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	1190 return (validate_repeating_list(tree, testlist1,
9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	1191 validate_test, "testlist1"));
9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	1192 }
9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	1193
9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	1194
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1195 /* validate either vfpdef or tfpdef.
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1196 * vfpdef: NAME
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1197 * tfpdef: NAME [':' test]
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1198 */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1199 static int
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1200 validate_vfpdef(node *tree)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1201 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1202 int nch = NCH(tree);
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1203 if (TYPE(tree) == vfpdef) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1204 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	1205 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1206 else if (TYPE(tree) == tfpdef) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1207 if (nch == 1) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1208 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	1209 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1210 else if (nch == 3) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1211 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	1212 validate_colon(CHILD(tree, 1)) &&
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1213 validate_test(CHILD(tree, 2));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1214 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1215 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1216 return 0;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1217 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1218
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1219 /* '' vfpdef (',' vfpdef ['=' test]) [',' '' vfpdef] \| '' vfpdef
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1220 * ..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	1221 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1222 static int
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1223 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	1224 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1225 int nch = NCH(tree);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1226 int res = 0, i;
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1227 int sym;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1228
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1229 if (nch <= start) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1230 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	1231 return 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1232 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1233 sym = TYPE(CHILD(tree, start));
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1234 if (sym == STAR) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1235 /*
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1236 * '' 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	1237 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1238 if (nch-start == 2)
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1239 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	1240 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	1241 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	1242 && 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	1243 && 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	1244 && validate_vfpdef(CHILD(tree, start+4)));
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1245 else {
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1246 /* skip over vfpdef (',' vfpdef ['=' test])* */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1247 i = start + 1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1248 if (TYPE(CHILD(tree, i)) == vfpdef \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1249 TYPE(CHILD(tree, i)) == tfpdef) { /* skip over vfpdef or tfpdef */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1250 i += 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1251 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1252 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	1253 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	1254 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	1255 break;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1256 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	1257 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	1258 res = res && (i+3 < nch)
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1259 && validate_test(CHILD(tree, i+3));
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1260 i += 4;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1261 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1262 else {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1263 i += 2;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1264 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1265 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1266 /* [',' '*' vfpdef] /
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1267 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	1268 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	1269 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	1270 }
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1271 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1272 else if (sym == DOUBLESTAR) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1273 /*
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1274 * '**' NAME
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1275 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1276 if (nch-start == 2)
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1277 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	1278 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1279 if (!res)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1280 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	1281 return res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1282 }
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
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1285 /* validate_varargslist()
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1286 *
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1287 * Validate typedargslist or varargslist.
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1288 *
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1289 * typedargslist: ((tfpdef ['=' test] ',')*
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1290 * ('' [tfpdef] (',' tfpdef ['=' test]) [',' '**' tfpdef] \|
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1291 * '**' tfpdef)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1292 * \| tfpdef ['=' test] (',' tfpdef ['=' test])* [','])
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1293 * tfpdef: NAME [':' test]
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1294 * varargslist: ((vfpdef ['=' test] ',')*
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1295 * ('' [vfpdef] (',' vfpdef ['=' test]) [',' '**' vfpdef] \|
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1296 * '**' vfpdef)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1297 * \| vfpdef ['=' test] (',' vfpdef ['=' test])* [','])
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1298 * vfpdef: NAME
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1299 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1300 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1301 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1302 validate_varargslist(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1303 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1304 int nch = NCH(tree);
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1305 int res = (TYPE(tree) == varargslist \|\|
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1306 TYPE(tree) == typedargslist) &&
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1307 (nch != 0);
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1308 int sym;
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1309 node *ch;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1310 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	1311
15506 ac830c9e9a83 validate_varargslist(): Fix two bugs in this function, one that affected Fred Drake <fdrake@acm.org> parents: 15318 diff changeset	1312 if (!res)
ac830c9e9a83 validate_varargslist(): Fix two bugs in this function, one that affected Fred Drake <fdrake@acm.org> parents: 15318 diff changeset	1313 return 0;
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1314 if (nch < 1) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1315 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	1316 return 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1317 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1318 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	1319 ch = CHILD(tree, i);
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1320 sym = TYPE(ch);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1321 if (sym == vfpdef \|\| sym == tfpdef) {
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1322 /* validate (vfpdef ['=' test] ',')+ */
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1323 res = validate_vfpdef(ch);
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1324 ++i;
15506 ac830c9e9a83 validate_varargslist(): Fix two bugs in this function, one that affected Fred Drake <fdrake@acm.org> parents: 15318 diff changeset	1325 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	1326 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	1327 && 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	1328 if (res)
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1329 i += 2;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1330 }
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1331 if (res && i < nch) {
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1332 res = validate_comma(CHILD(tree, i));
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1333 ++i;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1334 }
41717 9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1335 } else if (sym == DOUBLESTAR \|\| sym == STAR) {
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1336 res = validate_varargslist_trailer(tree, i);
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1337 break;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1338 } else {
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1339 res = 0;
9ad84070b22d Merged revisions 55328-55341 via svnmerge from Guido van Rossum <guido@python.org> parents: 41699 diff changeset	1340 err_string("illegal formation for varargslist");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1341 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1342 }
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1343 return res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1344 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1345
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1346
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1347 /* 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	1348 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1349 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1350 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	1351 {
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1352 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	1353 && validate_numnodes(tree, 1, "comp_iter"));
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1354 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	1355 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	1356 else
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1357 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	1358
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1359 return res;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1360 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1361
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1362 /* 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	1363 */
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1364 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1365 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	1366 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1367 int nch = NCH(tree);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1368 int res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1369
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1370 if (nch == 5)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1371 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	1372 else
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1373 res = validate_numnodes(tree, 4, "comp_for");
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1374
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1375 if (res)
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1376 res = (validate_name(CHILD(tree, 0), "for")
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1377 && validate_exprlist(CHILD(tree, 1))
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1378 && validate_name(CHILD(tree, 2), "in")
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	1379 && validate_or_test(CHILD(tree, 3)));
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1380
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1381 return res;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1382 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	1383
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1384 /* 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	1385 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1386 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1387 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	1388 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1389 int nch = NCH(tree);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1390 int res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1391
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1392 if (nch == 3)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1393 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	1394 else
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	1395 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	1396
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1397 if (res)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1398 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	1399 && 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	1400
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1401 return res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1402 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1403
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1404
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1405 /* simple_stmt \| compound_stmt
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1406 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1407 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1408 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1409 validate_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1410 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1411 int res = (validate_ntype(tree, stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1412 && validate_numnodes(tree, 1, "stmt"));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1413
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1414 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1415 tree = CHILD(tree, 0);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1416
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1417 if (TYPE(tree) == simple_stmt)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1418 res = validate_simple_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1419 else
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1420 res = validate_compound_stmt(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1421 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1422 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1423 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1424
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1425
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1426 /* small_stmt (';' small_stmt)* [';'] NEWLINE
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1427 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1428 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1429 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1430 validate_simple_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1431 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1432 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1433 int res = (validate_ntype(tree, simple_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1434 && (nch >= 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1435 && validate_small_stmt(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1436 && validate_newline(CHILD(tree, nch - 1)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1437
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1438 if (nch < 2)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1439 res = validate_numnodes(tree, 2, "simple_stmt");
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1440 --nch; /* forget the NEWLINE */
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1441 if (res && is_even(nch))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1442 res = validate_semi(CHILD(tree, --nch));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1443 if (res && (nch > 2)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1444 int i;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1445
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1446 for (i = 1; res && (i < nch); i += 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1447 res = (validate_semi(CHILD(tree, i))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1448 && 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	1449 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1450 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1451 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1452
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1453
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1454 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1455 validate_small_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1456 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1457 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	1458 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	1459
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1460 if (res) {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1461 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	1462
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1463 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	1464 \|\| (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	1465 \|\| (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	1466 \|\| (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	1467 \|\| (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	1468 \|\| (ntype == global_stmt)
39782 c94f37054f19 Patch #1550800: make exec a function. Georg Brandl <georg@python.org> parents: 39701 diff changeset	1469 \|\| (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	1470 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	1471 else {
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1472 res = 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1473 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	1474 }
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1475 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1476 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	1477 res = 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1478 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	1479 "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	1480 TYPE(CHILD(tree, 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1481 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1482 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1483 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1484
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1485
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1486 /* 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	1487 * 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	1488 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1489 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1490 validate_compound_stmt(node *tree)
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 int res = (validate_ntype(tree, compound_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1493 && 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	1494 int ntype;
3774 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 if (!res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1497 return (0);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1498
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1499 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	1500 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	1501 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	1502 \|\| (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	1503 \|\| (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	1504 \|\| (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	1505 \|\| (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	1506 \|\| (ntype == funcdef)
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1507 \|\| (ntype == classdef)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	1508 \|\| (ntype == decorated))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1509 res = validate_node(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1510 else {
14533 635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1511 res = 0;
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1512 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	1513 "Illegal compound statement type: %d.", TYPE(tree));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1514 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1515 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1516 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1517
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1518 static int
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1519 validate_yield_or_testlist(node *tree)
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1520 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1521 if (TYPE(tree) == yield_expr)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1522 return validate_yield_expr(tree);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1523 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1524 return validate_testlist(tree);
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1525 }
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1526
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1527 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1528 validate_expr_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1529 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1530 int j;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1531 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1532 int res = (validate_ntype(tree, expr_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1533 && is_odd(nch)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1534 && validate_testlist(CHILD(tree, 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1535
14214 b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1536 if (res && nch == 3
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1537 && 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	1538 res = validate_numnodes(CHILD(tree, 1), 1, "augassign")
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1539 && validate_yield_or_testlist(CHILD(tree, 2));
14214 b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1540
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1541 if (res) {
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1542 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	1543
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1544 res = (strcmp(s, "+=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1545 \|\| strcmp(s, "-=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1546 \|\| strcmp(s, "*=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1547 \|\| strcmp(s, "/=") == 0
27517 51abb5e86226 Teach the parsermodule about floor division. Fixes Michael W. Hudson <mwh@python.net> parents: 26979 diff changeset	1548 \|\| strcmp(s, "//=") == 0
14214 b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1549 \|\| strcmp(s, "%=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1550 \|\| strcmp(s, "&=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1551 \|\| strcmp(s, "\|=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1552 \|\| strcmp(s, "^=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1553 \|\| strcmp(s, "<<=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1554 \|\| strcmp(s, ">>=") == 0
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1555 \|\| strcmp(s, "**=") == 0);
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 err_string("illegal augmmented assignment operator");
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 }
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1560 else {
b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1561 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	1562 res = validate_equal(CHILD(tree, j))
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1563 && validate_yield_or_testlist(CHILD(tree, j + 1));
14214 b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	1564 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1565 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1566 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1567
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1568
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1569 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1570 validate_del_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1571 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1572 return (validate_numnodes(tree, 2, "del_stmt")
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1573 && validate_name(CHILD(tree, 0), "del")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1574 && validate_exprlist(CHILD(tree, 1)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1575 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1576
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1577
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1578 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1579 validate_return_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1580 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1581 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1582 int res = (validate_ntype(tree, return_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1583 && ((nch == 1) \|\| (nch == 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1584 && validate_name(CHILD(tree, 0), "return"));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1585
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1586 if (res && (nch == 2))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1587 res = validate_testlist(CHILD(tree, 1));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1588
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1589 return (res);
12416 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_raise_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, raise_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1598 && ((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	1599
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1600 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1601 res = validate_name(CHILD(tree, 0), "raise");
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1602 if (res && (nch >= 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1603 res = validate_test(CHILD(tree, 1));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1604 if (res && nch > 2) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1605 res = (validate_comma(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1606 && validate_test(CHILD(tree, 3)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1607 if (res && (nch > 4))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1608 res = (validate_comma(CHILD(tree, 4))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1609 && validate_test(CHILD(tree, 5)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1610 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1611 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1612 else
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1613 (void) validate_numnodes(tree, 2, "raise");
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1614 if (res && (nch == 4))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1615 res = (validate_comma(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1616 && validate_test(CHILD(tree, 3)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1617
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1618 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1619 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1620
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1621
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1622 /* 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	1623 */
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1624 static int
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1625 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	1626 {
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1627 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	1628 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	1629 && ((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	1630 && 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	1631
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1632 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	1633 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	1634
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1635 return (res);
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1636 }
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	1637
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 /* yield_stmt: yield_expr
18646 c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1640 */
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1641 static int
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1642 validate_yield_stmt(node *tree)
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1643 {
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1644 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	1645 && 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	1646 && validate_yield_expr(CHILD(tree, 0)));
18646 c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1647 }
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1648
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	1649
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1650 static int
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1651 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	1652 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1653 int nch = NCH(tree);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1654 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	1655
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1656 if (ok) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1657 if (nch == 1)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1658 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	1659 else if (nch == 3)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1660 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	1661 && 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	1662 && 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	1663 else
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1664 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	1665 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1666 return ok;
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
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1669
15751 939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1670 /* dotted_name: NAME ("." NAME)*
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1671 */
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1672 static int
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1673 validate_dotted_name(node *tree)
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1674 {
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1675 int nch = NCH(tree);
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1676 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	1677 && is_odd(nch)
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1678 && 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	1679 int i;
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1680
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1681 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	1682 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	1683 && 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	1684 }
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1685 return res;
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
939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1688
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1689 /* 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	1690 */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1691 static int
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1692 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	1693 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1694 int nch = NCH(tree);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1695 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	1696
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1697 if (res) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1698 if (nch == 1)
15751 939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1699 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	1700 else if (nch == 3)
15751 939b8fffc452 Fix problems with validation of import statement parse trees. Fred Drake <fdrake@acm.org> parents: 15506 diff changeset	1701 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	1702 && 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	1703 && 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	1704 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1705 res = 0;
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	1706 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	1707 }
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 return res;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	1710 }
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
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1713 /* dotted_as_name (',' dotted_as_name)* */
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1714 static int
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1715 validate_dotted_as_names(node *tree)
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1716 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1717 int nch = NCH(tree);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1718 int res = is_odd(nch) && validate_dotted_as_name(CHILD(tree, 0));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1719 int i;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1720
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1721 for (i = 1; res && (i < nch); i += 2)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1722 res = (validate_comma(CHILD(tree, i))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1723 && validate_dotted_as_name(CHILD(tree, i + 1)));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1724 return (res);
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1725 }
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1726
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1727
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1728 /* import_as_name (',' import_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_import_as_names(node *tree)
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1731 {
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1732 int nch = NCH(tree);
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1733 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	1734 int i;
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1735
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1736 for (i = 1; res && (i + 1 < nch); i += 2)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1737 res = (validate_comma(CHILD(tree, i))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1738 && 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	1739 return (res);
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' dotted_as_names */
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_name(node *tree)
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1746 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1747 return (validate_ntype(tree, import_name)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1748 && validate_numnodes(tree, 2, "import_name")
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1749 && validate_name(CHILD(tree, 0), "import")
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1750 && 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	1751 }
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1752
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	1753 /* Helper function to count the number of leading dots in
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1754 * 'from ...module import name'
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1755 */
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1756 static int
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1757 count_from_dots(node *tree)
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1758 {
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1759 int i;
49633 bd0e9a9cd283 Merged revisions 67028,67040,67044,67046,67052,67065,67070,67077,67082 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49624 diff changeset	1760 for (i = 1; i < NCH(tree); i++)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1761 if (TYPE(CHILD(tree, i)) != DOT)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1762 break;
49633 bd0e9a9cd283 Merged revisions 67028,67040,67044,67046,67052,67065,67070,67077,67082 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49624 diff changeset	1763 return i-1;
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1764 }
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36680 diff changeset	1765
62789 692b7989cd92 Merged revisions 82552-82553 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 62774 diff changeset	1766 /* import_from: ('from' ('.'* dotted_name \| '.'+)
692b7989cd92 Merged revisions 82552-82553 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 62774 diff changeset	1767 * 'import' ('*' \| '(' import_as_names ')' \| import_as_names))
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1768 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1769 static int
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1770 validate_import_from(node *tree)
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1771 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1772 int nch = NCH(tree);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1773 int ndots = count_from_dots(tree);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1774 int havename = (TYPE(CHILD(tree, ndots + 1)) == dotted_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1775 int offset = ndots + havename;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1776 int res = validate_ntype(tree, import_from)
62789 692b7989cd92 Merged revisions 82552-82553 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 62774 diff changeset	1777 && (offset >= 1)
692b7989cd92 Merged revisions 82552-82553 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 62774 diff changeset	1778 && (nch >= 3 + offset)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1779 && validate_name(CHILD(tree, 0), "from")
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1780 && (!havename \|\| validate_dotted_name(CHILD(tree, ndots + 1)))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1781 && validate_name(CHILD(tree, offset + 1), "import");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1782
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1783 if (res && TYPE(CHILD(tree, offset + 2)) == LPAR)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1784 res = ((nch == offset + 5)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1785 && validate_lparen(CHILD(tree, offset + 2))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1786 && validate_import_as_names(CHILD(tree, offset + 3))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1787 && validate_rparen(CHILD(tree, offset + 4)));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1788 else if (res && TYPE(CHILD(tree, offset + 2)) != STAR)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1789 res = validate_import_as_names(CHILD(tree, offset + 2));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1790 return (res);
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1791 }
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1792
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1793
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1794 /* import_stmt: import_name \| import_from */
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1795 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1796 validate_import_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1797 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1798 int nch = NCH(tree);
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1799 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	1800
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1801 if (res) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1802 int ntype = TYPE(CHILD(tree, 0));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1803
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	1804 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	1805 res = validate_node(CHILD(tree, 0));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1806 else {
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1807 res = 0;
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1808 err_string("illegal import_stmt child type");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1809 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1810 }
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1811 else if (nch == 1) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1812 res = 0;
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1813 PyErr_Format(parser_error,
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1814 "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	1815 TYPE(CHILD(tree, 0)));
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1816 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1817 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1818 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1819
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1820
33353 f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1821
f7474d31ba3f SF patch #1007189, multi-line imports, for instance: Anthony Baxter <anthonybaxter@gmail.com> parents: 33166 diff changeset	1822
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1823 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1824 validate_global_stmt(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1825 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1826 int j;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1827 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1828 int res = (validate_ntype(tree, global_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1829 && is_even(nch) && (nch >= 2));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1830
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	1831 if (!res && !PyErr_Occurred())
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	1832 err_string("illegal global statement");
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	1833
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1834 if (res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1835 res = (validate_name(CHILD(tree, 0), "global")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1836 && validate_ntype(CHILD(tree, 1), NAME));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1837 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	1838 res = (validate_comma(CHILD(tree, j))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1839 && validate_ntype(CHILD(tree, j + 1), NAME));
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 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1842 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1843
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1844
5236 b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1845 /* assert_stmt:
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1846 *
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1847 * 'assert' test [',' test]
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1848 */
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1849 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1850 validate_assert_stmt(node *tree)
5236 b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1851 {
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1852 int nch = NCH(tree);
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1853 int res = (validate_ntype(tree, assert_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1854 && ((nch == 2) \|\| (nch == 4))
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	1855 && (validate_name(CHILD(tree, 0), "assert"))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1856 && validate_test(CHILD(tree, 1)));
5236 b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1857
b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1858 if (!res && !PyErr_Occurred())
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	1859 err_string("illegal assert statement");
5236 b4e671bc1331 Support assert stmt. Guido van Rossum <guido@python.org> parents: 5039 diff changeset	1860 if (res && (nch > 2))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1861 res = (validate_comma(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1862 && validate_test(CHILD(tree, 3)));
5236 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 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1865 }
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
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1868 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1869 validate_while(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1870 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1871 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1872 int res = (validate_ntype(tree, while_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1873 && ((nch == 4) \|\| (nch == 7))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1874 && validate_name(CHILD(tree, 0), "while")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1875 && validate_test(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1876 && validate_colon(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1877 && validate_suite(CHILD(tree, 3)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1878
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1879 if (res && (nch == 7))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1880 res = (validate_name(CHILD(tree, 4), "else")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1881 && validate_colon(CHILD(tree, 5))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1882 && validate_suite(CHILD(tree, 6)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1883
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1884 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1885 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1886
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1887
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1888 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1889 validate_for(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1890 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1891 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1892 int res = (validate_ntype(tree, for_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1893 && ((nch == 6) \|\| (nch == 9))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1894 && validate_name(CHILD(tree, 0), "for")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1895 && validate_exprlist(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1896 && validate_name(CHILD(tree, 2), "in")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1897 && validate_testlist(CHILD(tree, 3))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1898 && validate_colon(CHILD(tree, 4))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1899 && validate_suite(CHILD(tree, 5)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1900
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1901 if (res && (nch == 9))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1902 res = (validate_name(CHILD(tree, 6), "else")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1903 && validate_colon(CHILD(tree, 7))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1904 && validate_suite(CHILD(tree, 8)));
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 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1907 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1908
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1909
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1910 /* try_stmt:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1911 * '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	1912 ['finally' ':' suite]
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1913 * \| 'try' ':' suite 'finally' ':' suite
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1914 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1915 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1916 static int
13503 6484098f40fc ANSI-fying Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13466 diff changeset	1917 validate_try(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1918 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1919 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1920 int pos = 3;
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1921 int res = (validate_ntype(tree, try_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1922 && (nch >= 6) && ((nch % 3) == 0));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1923
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1924 if (res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1925 res = (validate_name(CHILD(tree, 0), "try")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1926 && validate_colon(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1927 && validate_suite(CHILD(tree, 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1928 && validate_colon(CHILD(tree, nch - 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1929 && 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	1930 else if (!PyErr_Occurred()) {
13325 7bac10a9bb61 Andrew Kuchling <akuchlin@mems-exchange.org>: Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	1931 const char* name = "except";
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1932 if (TYPE(CHILD(tree, nch - 3)) != except_clause)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1933 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	1934
635f69123349 Simplify some of the code. Use PyErr_Format() instead of sprintf(), etc. Fred Drake <fdrake@acm.org> parents: 14375 diff changeset	1935 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	1936 "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	1937 }
50079 a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1938 /* Handle try/finally statement */
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1939 if (res && (TYPE(CHILD(tree, pos)) == NAME) &&
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1940 (strcmp(STR(CHILD(tree, pos)), "finally") == 0)) {
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1941 res = (validate_numnodes(tree, 6, "try/finally")
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1942 && validate_colon(CHILD(tree, 4))
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1943 && validate_suite(CHILD(tree, 5)));
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1944 return (res);
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1945 }
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1946 /* 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	1947 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	1948 res = (validate_except_clause(CHILD(tree, pos))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1949 && validate_colon(CHILD(tree, pos + 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1950 && validate_suite(CHILD(tree, pos + 2)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1951 pos += 3;
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 /* skip else clause */
54082 17d1946540d4 Merged revisions 72645 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 51271 diff changeset	1954 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	1955 (strcmp(STR(CHILD(tree, pos)), "else") == 0)) {
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1956 res = (validate_colon(CHILD(tree, pos + 1))
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1957 && validate_suite(CHILD(tree, pos + 2)));
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1958 pos += 3;
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1959 }
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1960 if (res && pos < nch) {
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1961 /* last clause must be a finally */
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1962 res = (validate_name(CHILD(tree, pos), "finally")
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1963 && 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	1964 && validate_colon(CHILD(tree, pos + 1))
a86cdf49b821 Manual merge of r67639 from py3k branch: Georg Brandl <georg@python.org> parents: 49908 diff changeset	1965 && validate_suite(CHILD(tree, pos + 2)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1966 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1967 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1968 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1969
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1970
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1971 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1972 validate_except_clause(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1973 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1974 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1975 int res = (validate_ntype(tree, except_clause)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1976 && ((nch == 1) \|\| (nch == 2) \|\| (nch == 4))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1977 && validate_name(CHILD(tree, 0), "except"));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1978
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1979 if (res && (nch > 1))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1980 res = validate_test(CHILD(tree, 1));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1981 if (res && (nch == 4))
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1982 res = (validate_name(CHILD(tree, 2), "as")
6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 40529 diff changeset	1983 && validate_ntype(CHILD(tree, 3), NAME));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1984
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1985 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1986 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1987
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1988
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	1989 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1990 validate_test(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1991 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1992 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1993 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	1994
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	1995 if (res && (TYPE(CHILD(tree, 0)) == lambdef))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1996 res = ((nch == 1)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	1997 && validate_lambdef(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	1998 else if (res) {
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	1999 res = validate_or_test(CHILD(tree, 0));
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2000 res = (res && (nch == 1 \|\| (nch == 5 &&
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2001 validate_name(CHILD(tree, 1), "if") &&
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2002 validate_or_test(CHILD(tree, 2)) &&
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2003 validate_name(CHILD(tree, 3), "else") &&
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2004 validate_test(CHILD(tree, 4)))));
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2005 }
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2006 return (res);
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2007 }
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2008
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2009 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2010 validate_test_nocond(node *tree)
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2011 {
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2012 int nch = NCH(tree);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2013 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	2014
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2015 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	2016 res = (validate_lambdef_nocond(CHILD(tree, 0)));
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2017 else if (res) {
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2018 res = (validate_or_test(CHILD(tree, 0)));
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2019 }
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2020 return (res);
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2021 }
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 static int
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2024 validate_or_test(node *tree)
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2025 {
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2026 int nch = NCH(tree);
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2027 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	2028
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2029 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2030 int pos;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2031 res = validate_and_test(CHILD(tree, 0));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2032 for (pos = 1; res && (pos < nch); pos += 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2033 res = (validate_name(CHILD(tree, pos), "or")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2034 && 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	2035 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2036 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2037 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2038
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2039
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2040 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2041 validate_and_test(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2042 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2043 int pos;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2044 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2045 int res = (validate_ntype(tree, and_test)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2046 && is_odd(nch)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2047 && validate_not_test(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2048
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2049 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	2050 res = (validate_name(CHILD(tree, pos), "and")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2051 && validate_not_test(CHILD(tree, 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2052
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2053 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2054 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2055
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2056
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2057 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2058 validate_not_test(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2059 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2060 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2061 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	2062
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2063 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2064 if (nch == 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2065 res = (validate_name(CHILD(tree, 0), "not")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2066 && validate_not_test(CHILD(tree, 1)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2067 else if (nch == 1)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2068 res = validate_comparison(CHILD(tree, 0));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2069 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2070 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2071 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2072
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2073
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2074 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2075 validate_comparison(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2076 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2077 int pos;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2078 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2079 int res = (validate_ntype(tree, comparison)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2080 && is_odd(nch)
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2081 && validate_star_expr(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2082
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2083 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	2084 res = (validate_comp_op(CHILD(tree, pos))
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2085 && validate_star_expr(CHILD(tree, pos + 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2086
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2087 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2088 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2089
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2090
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2091 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2092 validate_comp_op(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2093 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2094 int res = 0;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2095 int nch = NCH(tree);
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2096
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2097 if (!validate_ntype(tree, comp_op))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2098 return (0);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2099 if (nch == 1) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2100 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2101 * 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	2102 * 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	2103 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2104 tree = CHILD(tree, 0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2105 switch (TYPE(tree)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2106 case LESS:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2107 case GREATER:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2108 case EQEQUAL:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2109 case EQUAL:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2110 case LESSEQUAL:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2111 case GREATEREQUAL:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2112 case NOTEQUAL:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2113 res = 1;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2114 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2115 case NAME:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2116 res = ((strcmp(STR(tree), "in") == 0)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2117 \|\| (strcmp(STR(tree), "is") == 0));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2118 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	2119 PyErr_Format(parser_error,
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	2120 "illegal operator '%s'", STR(tree));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2121 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2122 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2123 default:
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	2124 err_string("illegal comparison operator type");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2125 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2126 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2127 }
4600 d36250aefb82 Keep gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2128 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	2129 res = (validate_ntype(CHILD(tree, 0), NAME)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2130 && validate_ntype(CHILD(tree, 1), NAME)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2131 && (((strcmp(STR(CHILD(tree, 0)), "is") == 0)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2132 && (strcmp(STR(CHILD(tree, 1)), "not") == 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2133 \|\| ((strcmp(STR(CHILD(tree, 0)), "not") == 0)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2134 && (strcmp(STR(CHILD(tree, 1)), "in") == 0))));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2135 if (!res && !PyErr_Occurred())
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	2136 err_string("unknown comparison operator");
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2137 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2138 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2139 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2140
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2141
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2142 static int
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2143 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	2144 {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2145 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	2146 if (!res) return res;
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2147 if (NCH(tree) == 2) {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2148 return validate_ntype(CHILD(tree, 0), STAR) && \
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2149 validate_expr(CHILD(tree, 1));
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2150 } else {
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2151 return validate_expr(CHILD(tree, 0));
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2152 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2153 }
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2154
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2155
e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2156 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2157 validate_expr(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2158 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2159 int j;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2160 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2161 int res = (validate_ntype(tree, expr)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2162 && is_odd(nch)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2163 && validate_xor_expr(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2164
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2165 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	2166 res = (validate_xor_expr(CHILD(tree, j))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2167 && validate_vbar(CHILD(tree, j - 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2168
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2169 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2170 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2171
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2172
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2173 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2174 validate_xor_expr(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2175 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2176 int j;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2177 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2178 int res = (validate_ntype(tree, xor_expr)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2179 && is_odd(nch)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2180 && validate_and_expr(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2181
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2182 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	2183 res = (validate_circumflex(CHILD(tree, j - 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2184 && validate_and_expr(CHILD(tree, j)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2185
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2186 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2187 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2188
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2189
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2190 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2191 validate_and_expr(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2192 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2193 int pos;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2194 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2195 int res = (validate_ntype(tree, and_expr)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2196 && is_odd(nch)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2197 && validate_shift_expr(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2198
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2199 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	2200 res = (validate_ampersand(CHILD(tree, pos))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2201 && validate_shift_expr(CHILD(tree, pos + 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2202
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2203 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2204 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2205
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2206
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2207 static int
13503 6484098f40fc ANSI-fying Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13466 diff changeset	2208 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	2209 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2210 int pos = 1;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2211 int nch = NCH(tree);
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2212 int res = (is_odd(nch)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2213 && (*termvalid)(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2214
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2215 for ( ; res && (pos < nch); pos += 2) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2216 if (TYPE(CHILD(tree, pos)) != op1)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2217 res = validate_ntype(CHILD(tree, pos), op2);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2218 if (res)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2219 res = (*termvalid)(CHILD(tree, pos + 1));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2220 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2221 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2222 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2223
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2224
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2225 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2226 validate_shift_expr(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2227 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2228 return (validate_ntype(tree, shift_expr)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2229 && validate_chain_two_ops(tree, validate_arith_expr,
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2230 LEFTSHIFT, RIGHTSHIFT));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2231 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2232
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2233
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2234 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2235 validate_arith_expr(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2236 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2237 return (validate_ntype(tree, arith_expr)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2238 && 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	2239 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2240
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2241
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2242 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2243 validate_term(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2244 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2245 int pos = 1;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2246 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2247 int res = (validate_ntype(tree, term)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2248 && is_odd(nch)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2249 && validate_factor(CHILD(tree, 0)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2250
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2251 for ( ; res && (pos < nch); pos += 2)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2252 res = (((TYPE(CHILD(tree, pos)) == STAR)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2253 \|\| (TYPE(CHILD(tree, pos)) == SLASH)
27517 51abb5e86226 Teach the parsermodule about floor division. Fixes Michael W. Hudson <mwh@python.net> parents: 26979 diff changeset	2254 \|\| (TYPE(CHILD(tree, pos)) == DOUBLESLASH)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2255 \|\| (TYPE(CHILD(tree, pos)) == PERCENT))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2256 && validate_factor(CHILD(tree, pos + 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2257
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2258 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2259 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2260
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2261
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2262 /* factor:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2263 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2264 * factor: ('+'\|'-'\|'~') factor \| power
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2265 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2266 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2267 validate_factor(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2268 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2269 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2270 int res = (validate_ntype(tree, factor)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2271 && (((nch == 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2272 && ((TYPE(CHILD(tree, 0)) == PLUS)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2273 \|\| (TYPE(CHILD(tree, 0)) == MINUS)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2274 \|\| (TYPE(CHILD(tree, 0)) == TILDE))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2275 && validate_factor(CHILD(tree, 1)))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2276 \|\| ((nch == 1)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2277 && validate_power(CHILD(tree, 0)))));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2278 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2279 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2280
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2281
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2282 /* power:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2283 *
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2284 * power: atom trailer* ('*' factor)
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2285 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2286 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2287 validate_power(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2288 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2289 int pos = 1;
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2290 int nch = NCH(tree);
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2291 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	2292 && validate_atom(CHILD(tree, 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2293
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2294 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	2295 res = validate_trailer(CHILD(tree, pos++));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2296 if (res && (pos < nch)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2297 if (!is_even(nch - pos)) {
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	2298 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	2299 return (0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2300 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2301 for ( ; res && (pos < (nch - 1)); pos += 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2302 res = (validate_doublestar(CHILD(tree, pos))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2303 && validate_factor(CHILD(tree, pos + 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2304 }
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2305 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2306 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2307
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2308
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2309 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2310 validate_atom(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2311 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2312 int pos;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2313 int nch = NCH(tree);
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2314 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	2315
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2316 if (res && nch < 1)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2317 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	2318 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2319 switch (TYPE(CHILD(tree, 0))) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2320 case LPAR:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2321 res = ((nch <= 3)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2322 && (validate_rparen(CHILD(tree, nch - 1))));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2323
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	2324 if (res && (nch == 3)) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2325 if (TYPE(CHILD(tree, 1))==yield_expr)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2326 res = validate_yield_expr(CHILD(tree, 1));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2327 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2328 res = validate_testlist_comp(CHILD(tree, 1));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2329 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2330 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2331 case LSQB:
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2332 if (nch == 2)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2333 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	2334 else if (nch == 3)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2335 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	2336 && 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	2337 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2338 res = 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2339 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	2340 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2341 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2342 case LBRACE:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2343 res = ((nch <= 3)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2344 && 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	2345
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2346 if (res && (nch == 3))
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2347 res = validate_dictorsetmaker(CHILD(tree, 1));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2348 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2349 case NAME:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2350 case NUMBER:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2351 res = (nch == 1);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2352 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2353 case STRING:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2354 for (pos = 1; res && (pos < nch); ++pos)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2355 res = validate_ntype(CHILD(tree, pos), STRING);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2356 break;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2357 case DOT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2358 res = (nch == 3 &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2359 validate_ntype(CHILD(tree, 1), DOT) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2360 validate_ntype(CHILD(tree, 2), DOT));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2361 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2362 default:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2363 res = 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2364 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2365 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2366 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2367 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2368 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2369
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2370
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2371 /* testlist_comp:
060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2372 * 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	2373 */
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2374 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2375 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	2376 {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2377 int nch = NCH(tree);
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2378 int ok = nch;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2379
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2380 if (nch == 0)
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2381 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	2382 else {
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2383 ok = validate_test(CHILD(tree, 0));
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2384 }
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2385
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2386 /*
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2387 * comp_for \| (',' test)* [',']
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2388 */
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2389 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	2390 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	2391 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2392 /* (',' test)* [','] */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2393 int i = 1;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2394 while (ok && nch - i >= 2) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2395 ok = (validate_comma(CHILD(tree, i))
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2396 && validate_test(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	2397 i += 2;
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2398 }
14129 2c2ae86dfe87 validate_listmaker(): Revise to match Skip's latest changes to the Fred Drake <fdrake@acm.org> parents: 14113 diff changeset	2399 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	2400 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	2401 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	2402 ok = 0;
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2403 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	2404 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2405 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2406 return ok;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2407 }
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2408
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2409 /* decorator:
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2410 * '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2411 */
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2412 static int
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2413 validate_decorator(node *tree)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2414 {
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2415 int ok;
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2416 int nch = NCH(tree);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2417 ok = (validate_ntype(tree, decorator) &&
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2418 (nch == 3 \|\| nch == 5 \|\| nch == 6) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2419 validate_at(CHILD(tree, 0)) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2420 validate_dotted_name(CHILD(tree, 1)) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2421 validate_newline(RCHILD(tree, -1)));
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2422
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2423 if (ok && nch != 3) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2424 ok = (validate_lparen(CHILD(tree, 2)) &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2425 validate_rparen(RCHILD(tree, -2)));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2426
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2427 if (ok && nch == 6)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2428 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	2429 }
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2430
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2431 return ok;
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2432 }
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2433
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2434 /* decorators:
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2435 * decorator+
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2436 */
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2437 static int
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2438 validate_decorators(node *tree)
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2439 {
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	2440 int i, nch, ok;
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2441 nch = NCH(tree);
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2442 ok = validate_ntype(tree, decorators) && nch >= 1;
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2443
2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2444 for (i = 0; ok && i < nch; ++i)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2445 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	2446
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2447 return ok;
33166 2e8d2bdd33de This is Mark Russell's patch: Michael W. Hudson <mwh@python.net> parents: 32888 diff changeset	2448 }
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2449
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2450 /* with_item:
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2451 * 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	2452 */
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	2453 static int
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2454 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	2455 {
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	2456 int nch = NCH(tree);
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2457 int ok = (validate_ntype(tree, with_item)
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2458 && (nch == 1 \|\| nch == 3)
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2459 && validate_test(CHILD(tree, 0)));
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2460 if (ok && nch == 3)
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2461 ok = (validate_name(CHILD(tree, 1), "as")
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2462 && validate_expr(CHILD(tree, 2)));
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2463 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	2464 }
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
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2466 /* with_stmt:
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2467 * 0 1 ... -2 -1
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2468 * '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	2469 */
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	2470 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	2471 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	2472 {
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2473 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	2474 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	2475 int ok = (validate_ntype(tree, with_stmt)
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2476 && (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	2477 && 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	2478 && 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	2479 && validate_suite(RCHILD(tree, -1)));
54338 287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2480 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	2481 ok = validate_with_item(CHILD(tree, i));
287ce30d08b5 Merged revisions 72924 via svnmerge from Georg Brandl <georg@python.org> parents: 54082 diff changeset	2482 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	2483 }
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
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2485 /* funcdef:
43862 d4f9706cb46b Patch 1144 by David Binger, fix for parser module. With unittest. Guido van Rossum <guido@python.org> parents: 42856 diff changeset	2486 *
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2487 * -5 -4 -3 -2 -1
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2488 * 'def' NAME parameters ':' suite
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2489 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2490 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2491 validate_funcdef(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2492 {
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2493 int nch = NCH(tree);
c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2494 int ok = (validate_ntype(tree, funcdef)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2495 && (nch == 5)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2496 && validate_name(RCHILD(tree, -5), "def")
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2497 && validate_ntype(RCHILD(tree, -4), NAME)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2498 && validate_colon(RCHILD(tree, -2))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2499 && validate_parameters(RCHILD(tree, -3))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2500 && validate_suite(RCHILD(tree, -1)));
32888 c7e03cf8333e PEP-0318, @decorator-style. In Guido's words: Anthony Baxter <anthonybaxter@gmail.com> parents: 32121 diff changeset	2501 return ok;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2502 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2503
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2504
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2505 /* decorated
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2506 * decorators (classdef \| funcdef)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2507 */
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2508 static int
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2509 validate_decorated(node *tree)
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41717 diff changeset	2510 {
62774 18282039c5c9 Merged revisions 82537 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61467 diff changeset	2511 int nch = NCH(tree);
18282039c5c9 Merged revisions 82537 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61467 diff changeset	2512 int ok = (validate_ntype(tree, decorated)
18282039c5c9 Merged revisions 82537 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61467 diff changeset	2513 && (nch == 2)
18282039c5c9 Merged revisions 82537 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61467 diff changeset	2514 && validate_decorators(RCHILD(tree, -2)));
18282039c5c9 Merged revisions 82537 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61467 diff changeset	2515 if (TYPE(RCHILD(tree, -1)) == funcdef)
18282039c5c9 Merged revisions 82537 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61467 diff changeset	2516 ok = ok && validate_funcdef(RCHILD(tree, -1));
18282039c5c9 Merged revisions 82537 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61467 diff changeset	2517 else
18282039c5c9 Merged revisions 82537 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61467 diff changeset	2518 ok = ok && validate_class(RCHILD(tree, -1));
18282039c5c9 Merged revisions 82537 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 61467 diff changeset	2519 return ok;
41824 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
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2522 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2523 validate_lambdef(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2524 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2525 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2526 int res = (validate_ntype(tree, lambdef)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2527 && ((nch == 3) \|\| (nch == 4))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2528 && validate_name(CHILD(tree, 0), "lambda")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2529 && validate_colon(CHILD(tree, nch - 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2530 && validate_test(CHILD(tree, nch - 1)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2531
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2532 if (res && (nch == 4))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2533 res = validate_varargslist(CHILD(tree, 1));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2534 else if (!res && !PyErr_Occurred())
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2535 (void) validate_numnodes(tree, 3, "lambdef");
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2536
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2537 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2538 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2539
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2540
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2541 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2542 validate_lambdef_nocond(node *tree)
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2543 {
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2544 int nch = NCH(tree);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2545 int res = (validate_ntype(tree, lambdef_nocond)
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2546 && ((nch == 3) \|\| (nch == 4))
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2547 && validate_name(CHILD(tree, 0), "lambda")
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2548 && validate_colon(CHILD(tree, nch - 2))
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2549 && validate_test(CHILD(tree, nch - 1)));
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2550
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2551 if (res && (nch == 4))
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2552 res = validate_varargslist(CHILD(tree, 1));
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2553 else if (!res && !PyErr_Occurred())
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2554 (void) validate_numnodes(tree, 3, "lambdef_nocond");
36673 2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2555
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2556 return (res);
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2557 }
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2558
2ddea5535f08 Update for PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36518 diff changeset	2559
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2560 /* arglist:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2561 *
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2562 * (argument ',')* (argument [','] \| '' test [',' '' test] \| '*' test)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2563 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2564 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2565 validate_arglist(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2566 {
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2567 int nch = NCH(tree);
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2568 int i = 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2569 int ok = 1;
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2570
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2571 if (nch <= 0)
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2572 /* 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	2573 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	2574
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2575 if (nch > 1) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2576 for (i=0; i<nch; i++) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2577 if (TYPE(CHILD(tree, i)) == argument) {
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2578 node *ch = CHILD(tree, i);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2579 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	2580 err_string("need '(', ')' for generator expression");
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2581 return 0;
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2582 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2583 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2584 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2585 }
302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2586
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2587 while (ok && nch-i >= 2) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2588 /* skip leading (argument ',') */
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2589 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	2590 && 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	2591 if (ok)
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2592 i += 2;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2593 else
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2594 PyErr_Clear();
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2595 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2596 ok = 1;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2597 if (nch-i > 0) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2598 /*
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2599 * argument \| '' test [',' '' test] \| '*' test
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2600 */
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2601 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	2602
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2603 if (sym == argument) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2604 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	2605 if (ok && i+1 != nch) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2606 err_string("illegal arglist specification"
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2607 " (extra stuff on end)");
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2608 ok = 0;
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2609 }
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2610 }
14110 0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2611 else if (sym == STAR) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2612 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	2613 if (ok && (nch-i == 2))
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2614 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	2615 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	2616 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	2617 && 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	2618 && 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	2619 && 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	2620 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2621 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	2622 ok = 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2623 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2624 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2625 else if (sym == DOUBLESTAR) {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2626 if (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_doublestar(CHILD(tree, i))
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2628 && 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	2629 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2630 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	2631 ok = 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2632 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2633 }
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2634 else {
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2635 err_string("illegal arglist specification");
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2636 ok = 0;
0abfca0035dc Update to reflect recent grammar changes (list comprehensions, extended Fred Drake <fdrake@acm.org> parents: 13692 diff changeset	2637 }
12487 f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2638 }
f1e867ad7d85 validate_arglist(): Re-written to reflect extended call syntax. Fred Drake <fdrake@acm.org> parents: 12416 diff changeset	2639 return (ok);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2640 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2641
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2642
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2643
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2644 /* argument:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2645 *
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2646 * [test '='] test [comp_for]
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2647 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2648 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2649 validate_argument(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2650 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2651 int nch = NCH(tree);
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2652 int res = (validate_ntype(tree, argument)
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2653 && ((nch == 1) \|\| (nch == 2) \|\| (nch == 3))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2654 && validate_test(CHILD(tree, 0)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2655
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2656 if (res && (nch == 2))
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2657 res = validate_comp_for(CHILD(tree, 1));
32121 302d399cfd37 SF patch #872326: Generator expression implementation Raymond Hettinger <python@rcn.com> parents: 30979 diff changeset	2658 else if (res && (nch == 3))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2659 res = (validate_equal(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2660 && validate_test(CHILD(tree, 2)));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2661
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2662 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2663 }
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2664
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2665
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2666
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2667 /* trailer:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2668 *
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2669 * '(' [arglist] ')' \| '[' subscriptlist ']' \| '.' NAME
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2670 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2671 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2672 validate_trailer(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2673 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2674 int nch = NCH(tree);
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2675 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	2676
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2677 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2678 switch (TYPE(CHILD(tree, 0))) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2679 case LPAR:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2680 res = validate_rparen(CHILD(tree, nch - 1));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2681 if (res && (nch == 3))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2682 res = validate_arglist(CHILD(tree, 1));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2683 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2684 case LSQB:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2685 res = (validate_numnodes(tree, 3, "trailer")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2686 && validate_subscriptlist(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2687 && validate_ntype(CHILD(tree, 2), RSQB));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2688 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2689 case DOT:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2690 res = (validate_numnodes(tree, 2, "trailer")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2691 && validate_ntype(CHILD(tree, 1), NAME));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2692 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2693 default:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2694 res = 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2695 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2696 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2697 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2698 else {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2699 (void) validate_numnodes(tree, 2, "trailer");
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2700 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2701 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2702 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2703
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2704
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2705 /* subscriptlist:
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2706 *
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2707 * subscript (',' subscript)* [',']
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2708 */
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2709 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2710 validate_subscriptlist(node *tree)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2711 {
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2712 return (validate_repeating_list(tree, subscriptlist,
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2713 validate_subscript, "subscriptlist"));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2714 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2715
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2716
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2717 /* subscript:
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2718 *
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2719 * '.' '.' '.' \| test \| [test] ':' [test] [sliceop]
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2720 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2721 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2722 validate_subscript(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2723 {
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2724 int offset = 0;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2725 int nch = NCH(tree);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2726 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	2727
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2728 if (!res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2729 if (!PyErr_Occurred())
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2730 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	2731 return (0);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2732 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2733 if (TYPE(CHILD(tree, 0)) == DOT)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2734 /* take care of ('.' '.' '.') possibility */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2735 return (validate_numnodes(tree, 3, "subscript")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2736 && validate_dot(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2737 && validate_dot(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2738 && validate_dot(CHILD(tree, 2)));
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2739 if (nch == 1) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2740 if (TYPE(CHILD(tree, 0)) == test)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2741 res = validate_test(CHILD(tree, 0));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2742 else
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2743 res = validate_colon(CHILD(tree, 0));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2744 return (res);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2745 }
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2746 /* Must be [test] ':' [test] [sliceop],
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2747 * 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	2748 * 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	2749 */
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2750 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	2751 res = validate_test(CHILD(tree, 0));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2752 offset = 1;
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2753 }
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2754 if (res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2755 res = validate_colon(CHILD(tree, offset));
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2756 if (res) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2757 int rem = nch - ++offset;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2758 if (rem) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2759 if (TYPE(CHILD(tree, offset)) == test) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2760 res = validate_test(CHILD(tree, offset));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2761 ++offset;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2762 --rem;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2763 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2764 if (res && rem)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2765 res = validate_sliceop(CHILD(tree, offset));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2766 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2767 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2768 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2769 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2770
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2771
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2772 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2773 validate_sliceop(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2774 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2775 int nch = NCH(tree);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2776 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	2777 && validate_ntype(tree, sliceop);
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2778 if (!res && !PyErr_Occurred()) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2779 res = validate_numnodes(tree, 1, "sliceop");
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2780 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2781 if (res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2782 res = validate_colon(CHILD(tree, 0));
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2783 if (res && (nch == 2))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2784 res = validate_test(CHILD(tree, 1));
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2785
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2786 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2787 }
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2788
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2789
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2790 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2791 validate_exprlist(node *tree)
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2792 {
7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2793 return (validate_repeating_list(tree, exprlist,
41699 e16c8e5c5ca4 Merged revisions 55225-55227,55229-55269 via svnmerge from Guido van Rossum <guido@python.org> parents: 41464 diff changeset	2794 validate_star_expr, "exprlist"));
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2795 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2796
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2797
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2798 static int
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2799 validate_dictorsetmaker(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2800 {
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2801 int nch = NCH(tree);
41464 060c79f6d919 Hide list comp variables and support set comprehensions Nick Coghlan <ncoghlan@gmail.com> parents: 40774 diff changeset	2802 int res = (validate_ntype(tree, dictorsetmaker)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2803 && (nch >= 3)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2804 && validate_test(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2805 && validate_colon(CHILD(tree, 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2806 && validate_test(CHILD(tree, 2)));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2807
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2808 if (res && ((nch % 4) == 0))
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2809 res = validate_comma(CHILD(tree, --nch));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2810 else if (res)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2811 res = ((nch % 4) == 3);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2812
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2813 if (res && (nch > 3)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2814 int pos = 3;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2815 /* ( ',' test ':' test )* */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2816 while (res && (pos < nch)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2817 res = (validate_comma(CHILD(tree, pos))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2818 && validate_test(CHILD(tree, pos + 1))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2819 && validate_colon(CHILD(tree, pos + 2))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2820 && validate_test(CHILD(tree, pos + 3)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2821 pos += 4;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2822 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2823 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2824 return (res);
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
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2829 validate_eval_input(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 pos;
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2832 int nch = NCH(tree);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2833 int res = (validate_ntype(tree, eval_input)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2834 && (nch >= 2)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2835 && validate_testlist(CHILD(tree, 0))
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2836 && 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	2837
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2838 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	2839 res = validate_ntype(CHILD(tree, pos), NEWLINE);
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2840
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2841 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2842 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2843
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	2844
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	2845 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2846 validate_node(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	2847 {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2848 int nch = 0; /* num. children on current node */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2849 int res = 1; /* result value */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2850 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	2851
18247 e3cf3348feca Properly use &&. Closes bug #434989. Martin v. Löwis <martin@v.loewis.de> parents: 15751 diff changeset	2852 while (res && (tree != 0)) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2853 nch = NCH(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2854 next = 0;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2855 switch (TYPE(tree)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2856 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2857 * Definition nodes.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2858 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2859 case funcdef:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2860 res = validate_funcdef(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2861 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	2862 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	2863 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	2864 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2865 case classdef:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2866 res = validate_class(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2867 break;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2868 case decorated:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2869 res = validate_decorated(tree);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2870 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2871 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2872 * "Trivial" parse tree nodes.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2873 * (Why did I call these trivial?)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2874 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2875 case stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2876 res = validate_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2877 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2878 case small_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2879 /*
40774 793e0323d4d6 Essential changes for print function changes. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	2880 * 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	2881 * \| import_stmt \| global_stmt \| assert_stmt
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2882 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2883 res = validate_small_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2884 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2885 case flow_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2886 res = (validate_numnodes(tree, 1, "flow_stmt")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2887 && ((TYPE(CHILD(tree, 0)) == break_stmt)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2888 \|\| (TYPE(CHILD(tree, 0)) == continue_stmt)
18646 c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	2889 \|\| (TYPE(CHILD(tree, 0)) == yield_stmt)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2890 \|\| (TYPE(CHILD(tree, 0)) == return_stmt)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2891 \|\| (TYPE(CHILD(tree, 0)) == raise_stmt)));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2892 if (res)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2893 next = CHILD(tree, 0);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2894 else if (nch == 1)
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	2895 err_string("illegal flow_stmt type");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2896 break;
18646 c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	2897 case yield_stmt:
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	2898 res = validate_yield_stmt(tree);
c43fe213ee10 Add support for yield statements. Fred Drake <fdrake@acm.org> parents: 18247 diff changeset	2899 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2900 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2901 * Compound statements.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2902 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2903 case simple_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2904 res = validate_simple_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2905 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2906 case compound_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2907 res = validate_compound_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2908 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2909 /*
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	2910 * Fundamental statements.
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2911 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2912 case expr_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2913 res = validate_expr_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 del_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2916 res = validate_del_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2917 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2918 case pass_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2919 res = (validate_numnodes(tree, 1, "pass")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2920 && validate_name(CHILD(tree, 0), "pass"));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2921 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2922 case break_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2923 res = (validate_numnodes(tree, 1, "break")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2924 && validate_name(CHILD(tree, 0), "break"));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2925 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2926 case continue_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2927 res = (validate_numnodes(tree, 1, "continue")
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2928 && validate_name(CHILD(tree, 0), "continue"));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2929 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2930 case return_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2931 res = validate_return_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2932 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2933 case raise_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2934 res = validate_raise_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 import_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2937 res = validate_import_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2938 break;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2939 case import_name:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2940 res = validate_import_name(tree);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2941 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2942 case import_from:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2943 res = validate_import_from(tree);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	2944 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2945 case global_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2946 res = validate_global_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 assert_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2949 res = validate_assert_stmt(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2950 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2951 case if_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2952 res = validate_if(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2953 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2954 case while_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2955 res = validate_while(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2956 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2957 case for_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2958 res = validate_for(tree);
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 try_stmt:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2961 res = validate_try(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 suite:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2964 res = validate_suite(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 /*
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2967 * Expression nodes.
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2968 */
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2969 case testlist:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2970 res = validate_testlist(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2971 break;
35298 b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	2972 case yield_expr:
b2fe5f8fcfdd PEP 342 implementation. Per Guido's comments, the generator throw() Phillip J. Eby <pje@telecommunity.com> parents: 34887 diff changeset	2973 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	2974 break;
23538 9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	2975 case testlist1:
9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	2976 res = validate_testlist1(tree);
9e67a0d5705f Disambiguate the grammar for backtick. Guido van Rossum <guido@python.org> parents: 21313 diff changeset	2977 break;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2978 case test:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2979 res = validate_test(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 and_test:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2982 res = validate_and_test(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 not_test:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2985 res = validate_not_test(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 comparison:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2988 res = validate_comparison(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 exprlist:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2991 res = validate_exprlist(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 comp_op:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2994 res = validate_comp_op(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 case expr:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2997 res = validate_expr(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2998 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	2999 case xor_expr:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3000 res = validate_xor_expr(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3001 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3002 case and_expr:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3003 res = validate_and_expr(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3004 break;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3005 case shift_expr:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3006 res = validate_shift_expr(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 arith_expr:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3009 res = validate_arith_expr(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 term:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3012 res = validate_term(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 factor:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3015 res = validate_factor(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 power:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3018 res = validate_power(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 atom:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3021 res = validate_atom(tree);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3022 break;
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3023
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3024 default:
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3025 /* Hopefully never reached! */
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	3026 err_string("unrecognized node type");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3027 res = 0;
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 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3030 tree = next;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3031 }
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3032 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3033 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3034
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3035
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	3036 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3037 validate_expr_tree(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3038 {
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3039 int res = validate_eval_input(tree);
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3040
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3041 if (!res && !PyErr_Occurred())
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	3042 err_string("could not validate expression tuple");
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3043
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3044 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3045 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3046
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3047
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3048 /* file_input:
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3049 * (NEWLINE \| stmt)* ENDMARKER
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3050 */
4084 7f83e24d1d86 New batch from Fred Guido van Rossum <guido@python.org> parents: 3774 diff changeset	3051 static int
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3052 validate_file_input(node *tree)
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3053 {
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3054 int j;
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3055 int nch = NCH(tree) - 1;
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3056 int res = ((nch >= 0)
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3057 && validate_ntype(CHILD(tree, nch), ENDMARKER));
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3058
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3059 for (j = 0; res && (j < nch); ++j) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3060 if (TYPE(CHILD(tree, j)) == stmt)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3061 res = validate_stmt(CHILD(tree, j));
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3062 else
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3063 res = validate_newline(CHILD(tree, j));
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3064 }
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	3065 /* 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	3066 * 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	3067 * this, we have some debugging to do.
3774 4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3068 */
4c78d73c5667 New submission by Fred Drake. Guido van Rossum <guido@python.org> parents: 3336 diff changeset	3069 if (!res && !PyErr_Occurred())
15318 8aa947e1eee8 Ka-Ping Yee <ping@lfw.org>: Fred Drake <fdrake@acm.org> parents: 14533 diff changeset	3070 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	3071
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3072 return (res);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3073 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3074
27767 82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3075 static int
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3076 validate_encoding_decl(node *tree)
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3077 {
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3078 int nch = NCH(tree);
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3079 int res = ((nch == 1)
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3080 && validate_file_input(CHILD(tree, 0)));
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3081
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3082 if (!res && !PyErr_Occurred())
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3083 err_string("Error Parsing encoding_decl");
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3084
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3085 return res;
82cbf1178e4f Apply logistix's patch from Michael W. Hudson <mwh@python.net> parents: 27517 diff changeset	3086 }
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3087
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3088 static PyObject*
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3089 pickle_constructor = NULL;
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3090
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3091
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3092 static PyObject*
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3093 parser__pickler(PyObject self, PyObject args)
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3094 {
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	3095 NOTE(ARGUNUSED(self))
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3096 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	3097 PyObject *st = NULL;
11297 2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	3098 PyObject *empty_dict = NULL;
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3099
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3100 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	3101 PyObject *newargs;
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3102 PyObject *tuple;
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3103
11297 2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	3104 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	3105 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	3106 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	3107 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	3108 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	3109 if (tuple != NULL) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3110 result = Py_BuildValue("O(O)", pickle_constructor, tuple);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3111 Py_DECREF(tuple);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3112 }
11297 2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	3113 Py_DECREF(empty_dict);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3114 Py_DECREF(newargs);
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3115 }
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3116 finally:
11297 2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	3117 Py_XDECREF(empty_dict);
2560236ecedb parser__pickler(): Don't drop the third argument to Fred Drake <fdrake@acm.org> parents: 11266 diff changeset	3118
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3119 return (result);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3120 }
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3121
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3122
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3123 /* 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	3124 * 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	3125 * 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	3126 * 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	3127 * inheritance.
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3128 */
8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3129 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	3130 {"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	3131 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	3132 {"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	3133 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	3134 {"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	3135 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	3136 {"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	3137 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	3138 {"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	3139 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	3140 {"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	3141 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	3142 {"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	3143 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	3144 {"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	3145 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	3146 {"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	3147 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	3148
cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3149 /* 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	3150 {"_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	3151 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	3152
8196 885de49b445c Made lint a bit happier. Fred Drake <fdrake@acm.org> parents: 8184 diff changeset	3153 {NULL, NULL, 0, NULL}
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3154 };
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
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3157
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3158 static struct PyModuleDef parsermodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	3159 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	3160 "parser",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	3161 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	3162 -1,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	3163 parser_functions,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	3164 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	3165 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	3166 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	3167 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3168 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3169
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3170 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	3171
979ff5d0ae07 Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link Mark Hammond <mhammond@skippinet.com.au> parents: 24280 diff changeset	3172 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	3173 PyInit_parser(void)
14214 b5fb175ad528 Update the parser module to support augmented assignment. Fred Drake <fdrake@acm.org> parents: 14129 diff changeset	3174 {
19274 5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3175 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	3176
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47580 diff changeset	3177 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	3178 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	3179 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	3180 if (module == NULL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 54338 diff changeset	3181 return NULL;
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3182
11266 c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	3183 if (parser_error == 0)
c0b86a44a120 Added keyword parameter support to all public interfaces; keyword Fred Drake <fdrake@acm.org> parents: 10215 diff changeset	3184 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	3185
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	3186 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	3187 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	3188 /* 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	3189 * 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	3190 * 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	3191 * 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	3192 * 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	3193 */
1cbc6b7836dc Merge 23c1-branch back into the head. Barry will send email about the Tim Peters <tim.peters@gmail.com> parents: 28551 diff changeset	3194 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	3195 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	3196 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	3197
18669 6d4a530fe7c1 The syntax trees handled by this module are not "abstract," so take the Fred Drake <fdrake@acm.org> parents: 18646 diff changeset	3198 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	3199 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	3200
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3201 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	3202 parser_copyright_string);
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3203 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	3204 parser_doc_string);
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3205 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	3206 parser_version_string);
3200 8f5ab1a6c914 Fred Drake's new parser module Guido van Rossum <guido@python.org> parents: 2150 diff changeset	3207
18748 e5bafddd1da0 Elaborate a comment. Fred Drake <fdrake@acm.org> parents: 18669 diff changeset	3208 /* Register to support pickling.
e5bafddd1da0 Elaborate a comment. Fred Drake <fdrake@acm.org> parents: 18669 diff changeset	3209 * 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	3210 * exception will be raised here; should we clear the exception?
e5bafddd1da0 Elaborate a comment. Fred Drake <fdrake@acm.org> parents: 18669 diff changeset	3211 */
46867 dd5513b472dc Rename copy_reg module to copyreg. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46644 diff changeset	3212 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	3213 if (copyreg != NULL) {
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3214 PyObject func, pickler;
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3215
19274 5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3216 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	3217 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	3218 pickler = PyObject_GetAttrString(module, "_pickler");
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3219 Py_XINCREF(pickle_constructor);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3220 if ((func != NULL) && (pickle_constructor != NULL)
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3221 && (pickler != NULL)) {
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3222 PyObject *res;
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3223
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3224 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	3225 pickle_constructor, NULL);
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3226 Py_XDECREF(res);
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3227 }
95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3228 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	3229 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	3230 Py_XDECREF(pickler);
5501958edc36 Use the abstract object interfaces when digging around in module objects Fred Drake <fdrake@acm.org> parents: 18748 diff changeset	3231 Py_DECREF(copyreg);
8034 cd3092069f5a Added support for pickling ast objects. Fred Drake <fdrake@acm.org> parents: 7982 diff changeset	3232 }
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 46867 diff changeset	3233 return module;
12416 95e296e67a12 ANSI-fy & de-tabify the source. Fred Drake <fdrake@acm.org> parents: 11828 diff changeset	3234 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/parsermodule.c @ 62789:692b7989cd92 3.1