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

annotate Modules/parsermodule.c @ 84007:dbfbdf2b5c19 3.3

Fix #17967: For ftp urls CWD to target instead of hopping to each directory towards target. This fixes a bug where target is accessible, but parent directories are restricted.

author	Senthil Kumaran <senthil@uthcode.com>
date	Sat, 01 Jun 2013 08:27:06 -0700
parents	8f10c9eae183
children	89c6495d1ff2

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

Mercurial > cpython-lru_cache-weakref

annotate Modules/parsermodule.c @ 84007:dbfbdf2b5c19 3.3