cpython-lru_cache-weakref: Python/ast.c annotate

annotate Python/ast.c @ 45403:0ea236a71d77 legacy-trunk

Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description).

author	Eric Smith <eric@trueblade.com>
date	Wed, 20 Feb 2008 23:34:22 +0000
parents	8da9ebf73026
children	393822f2ef90

rev	line source
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2 * This file includes functions to transform a concrete syntax tree (CST) to
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3 * an abstract syntax tree (AST). The main function is PyAST_FromNode().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	4 *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	5 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6 #include "Python.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7 #include "Python-ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	8 #include "grammar.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	9 #include "node.h"
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	10 #include "pyarena.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	11 #include "ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	12 #include "token.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	13 #include "parsetok.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	14 #include "graminit.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	15
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	16 #include <assert.h>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	17
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	18 /* Data structure used internally */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	19 struct compiling {
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	20 char c_encoding; / source encoding */
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	21 PyArena c_arena; / arena for allocating memeory */
43997 17479a09ec7c Added filename to compiling struct based on Martin's suggestion. Christian Heimes <christian@cheimes.de> parents: 43985 diff changeset	22 const char c_filename; / filename */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	23 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	24
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	25 static asdl_seq seq_for_testlist(struct compiling , const node *);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	26 static expr_ty ast_for_expr(struct compiling , const node );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	27 static stmt_ty ast_for_stmt(struct compiling , const node );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	28 static asdl_seq ast_for_suite(struct compiling , const node *);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	29 static asdl_seq ast_for_exprlist(struct compiling , const node *,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	30 expr_context_ty);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	31 static expr_ty ast_for_testlist(struct compiling , const node );
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	32 static expr_ty ast_for_testlist_gexp(struct compiling , const node );
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	33
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	34 /* Note different signature for ast_for_call */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	35 static expr_ty ast_for_call(struct compiling , const node , expr_ty);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	36
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	37 static PyObject parsenumber(const char );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	38 static PyObject parsestr(const char s, const char *encoding);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	39 static PyObject parsestrplus(struct compiling , const node *n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	40
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	41 #ifndef LINENO
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	42 #define LINENO(n) ((n)->n_lineno)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	43 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	44
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	45 static identifier
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	46 new_identifier(const char* n, PyArena *arena) {
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	47 PyObject* id = PyString_InternFromString(n);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	48 PyArena_AddPyObject(arena, id);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	49 return id;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	50 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	51
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	52 #define NEW_IDENTIFIER(n) new_identifier(STR(n), c->c_arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	53
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	54 /* This routine provides an invalid object for the syntax error.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	55 The outermost routine must unpack this error and create the
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	56 proper object. We do this so that we don't have to pass
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	57 the filename to everything function.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	58
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	59 XXX Maybe we should just pass the filename...
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	60 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	61
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	62 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	63 ast_error(const node n, const char errstr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	64 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	65 PyObject *u = Py_BuildValue("zi", errstr, LINENO(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	66 if (!u)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	67 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	68 PyErr_SetObject(PyExc_SyntaxError, u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	69 Py_DECREF(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	70 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	71 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	72
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	73 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	74 ast_error_finish(const char *filename)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	75 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	76 PyObject type, value, tback, errstr, loc, tmp;
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36224 diff changeset	77 long lineno;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	78
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	79 assert(PyErr_Occurred());
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	80 if (!PyErr_ExceptionMatches(PyExc_SyntaxError))
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	81 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	82
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	83 PyErr_Fetch(&type, &value, &tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	84 errstr = PyTuple_GetItem(value, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	85 if (!errstr)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	86 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	87 Py_INCREF(errstr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	88 lineno = PyInt_AsLong(PyTuple_GetItem(value, 1));
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	89 if (lineno == -1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	90 Py_DECREF(errstr);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	91 return;
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	92 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	93 Py_DECREF(value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	94
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	95 loc = PyErr_ProgramText(filename, lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	96 if (!loc) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	97 Py_INCREF(Py_None);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	98 loc = Py_None;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	99 }
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36224 diff changeset	100 tmp = Py_BuildValue("(zlOO)", filename, lineno, Py_None, loc);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	101 Py_DECREF(loc);
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	102 if (!tmp) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	103 Py_DECREF(errstr);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	104 return;
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	105 }
38406 8f7c7aeac3a5 Replace Py_BuildValue("OO") by PyTuple_Pack. Georg Brandl <georg@python.org> parents: 38218 diff changeset	106 value = PyTuple_Pack(2, errstr, tmp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	107 Py_DECREF(errstr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	108 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	109 if (!value)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	110 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	111 PyErr_Restore(type, value, tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	112 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	113
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	114 /* num_stmts() returns number of contained statements.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	115
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	116 Use this routine to determine how big a sequence is needed for
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	117 the statements in a parse tree. Its raison d'etre is this bit of
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	118 grammar:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	119
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	120 stmt: simple_stmt \| compound_stmt
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	121 simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	122
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	123 A simple_stmt can contain multiple small_stmt elements joined
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	124 by semicolons. If the arg is a simple_stmt, the number of
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	125 small_stmt elements is returned.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	126 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	127
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	128 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	129 num_stmts(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	130 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	131 int i, l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	132 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	133
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	134 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	135 case single_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	136 if (TYPE(CHILD(n, 0)) == NEWLINE)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	137 return 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	138 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	139 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	140 case file_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	141 l = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	142 for (i = 0; i < NCH(n); i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	143 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	144 if (TYPE(ch) == stmt)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	145 l += num_stmts(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	146 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	147 return l;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	148 case stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	149 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	150 case compound_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	151 return 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	152 case simple_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	153 return NCH(n) / 2; /* Divide by 2 to remove count of semi-colons */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	154 case suite:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	155 if (NCH(n) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	156 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	157 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	158 l = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	159 for (i = 2; i < (NCH(n) - 1); i++)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	160 l += num_stmts(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	161 return l;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	162 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	163 default: {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	164 char buf[128];
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	165
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	166 sprintf(buf, "Non-statement found: %d %d\n",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	167 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	168 Py_FatalError(buf);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	169 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	170 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	171 assert(0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	172 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	173 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	174
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	175 /* Transform the CST rooted at node * to the appropriate AST
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	176 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	177
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	178 mod_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	179 PyAST_FromNode(const node n, PyCompilerFlags flags, const char *filename,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	180 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	181 {
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	182 int i, j, k, num;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	183 asdl_seq *stmts = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	184 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	185 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	186 struct compiling c;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	187
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	188 if (flags && flags->cf_flags & PyCF_SOURCE_IS_UTF8) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	189 c.c_encoding = "utf-8";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	190 if (TYPE(n) == encoding_decl) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	191 ast_error(n, "encoding declaration in Unicode string");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	192 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	193 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	194 } else if (TYPE(n) == encoding_decl) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	195 c.c_encoding = STR(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	196 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	197 } else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	198 c.c_encoding = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	199 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	200 c.c_arena = arena;
43997 17479a09ec7c Added filename to compiling struct based on Martin's suggestion. Christian Heimes <christian@cheimes.de> parents: 43985 diff changeset	201 c.c_filename = filename;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	202
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	203 k = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	204 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	205 case file_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	206 stmts = asdl_seq_new(num_stmts(n), arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	207 if (!stmts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	208 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	209 for (i = 0; i < NCH(n) - 1; i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	210 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	211 if (TYPE(ch) == NEWLINE)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	212 continue;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	213 REQ(ch, stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	214 num = num_stmts(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	215 if (num == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	216 s = ast_for_stmt(&c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	217 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	218 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	219 asdl_seq_SET(stmts, k++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	220 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	221 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	222 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	223 REQ(ch, simple_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	224 for (j = 0; j < num; j++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	225 s = ast_for_stmt(&c, CHILD(ch, j * 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	226 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	227 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	228 asdl_seq_SET(stmts, k++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	229 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	230 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	231 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	232 return Module(stmts, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	233 case eval_input: {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	234 expr_ty testlist_ast;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	235
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	236 /* XXX Why not gen_for here? */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	237 testlist_ast = ast_for_testlist(&c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	238 if (!testlist_ast)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	239 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	240 return Expression(testlist_ast, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	241 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	242 case single_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	243 if (TYPE(CHILD(n, 0)) == NEWLINE) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	244 stmts = asdl_seq_new(1, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	245 if (!stmts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	246 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	247 asdl_seq_SET(stmts, 0, Pass(n->n_lineno, n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	248 arena));
41579 7a4f174df844 Handle a couple of uncaught errors. This should be backported Neal Norwitz <nnorwitz@gmail.com> parents: 41578 diff changeset	249 if (!asdl_seq_GET(stmts, 0))
7a4f174df844 Handle a couple of uncaught errors. This should be backported Neal Norwitz <nnorwitz@gmail.com> parents: 41578 diff changeset	250 goto error;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	251 return Interactive(stmts, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	252 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	253 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	254 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	255 num = num_stmts(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	256 stmts = asdl_seq_new(num, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	257 if (!stmts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	258 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	259 if (num == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	260 s = ast_for_stmt(&c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	261 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	262 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	263 asdl_seq_SET(stmts, 0, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	264 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	265 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	266 /* Only a simple_stmt can contain multiple statements. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	267 REQ(n, simple_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	268 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	269 if (TYPE(CHILD(n, i)) == NEWLINE)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	270 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	271 s = ast_for_stmt(&c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	272 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	273 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	274 asdl_seq_SET(stmts, i / 2, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	275 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	276 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	277
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	278 return Interactive(stmts, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	279 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	280 default:
41578 bc6a0fe32351 Actually raise an exception before calling ast_error_finish. Georg Brandl <georg@python.org> parents: 41215 diff changeset	281 PyErr_Format(PyExc_SystemError,
bc6a0fe32351 Actually raise an exception before calling ast_error_finish. Georg Brandl <georg@python.org> parents: 41215 diff changeset	282 "invalid node %d for PyAST_FromNode", TYPE(n));
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	283 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	284 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	285 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	286 ast_error_finish(filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	287 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	288 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	289
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	290 /* Return the AST repr. of the operator represented as syntax (\|, ^, etc.)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	291 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	292
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	293 static operator_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	294 get_operator(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	295 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	296 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	297 case VBAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	298 return BitOr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	299 case CIRCUMFLEX:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	300 return BitXor;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	301 case AMPER:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	302 return BitAnd;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	303 case LEFTSHIFT:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	304 return LShift;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	305 case RIGHTSHIFT:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	306 return RShift;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	307 case PLUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	308 return Add;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	309 case MINUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	310 return Sub;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	311 case STAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	312 return Mult;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	313 case SLASH:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	314 return Div;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	315 case DOUBLESLASH:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	316 return FloorDiv;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	317 case PERCENT:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	318 return Mod;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	319 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	320 return (operator_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	321 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	322 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	323
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	324 /* Set the context ctx for expr_ty e, recursively traversing e.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	325
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	326 Only sets context for expr kinds that "can appear in assignment context"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	327 (according to ../Parser/Python.asdl). For other expr kinds, it sets
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	328 an appropriate syntax error and returns false.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	329 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	330
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	331 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	332 set_context(expr_ty e, expr_context_ty ctx, const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	333 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	334 asdl_seq *s = NULL;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	335 /* If a particular expression type can't be used for assign / delete,
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	336 set expr_name to its name and an error message will be generated.
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	337 */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	338 const char* expr_name = NULL;
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	339
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	340 /* The ast defines augmented store and load contexts, but the
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	341 implementation here doesn't actually use them. The code may be
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	342 a little more complex than necessary as a result. It also means
39037 9f70f6ba7b69 Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39034 diff changeset	343 that expressions in an augmented assignment have a Store context.
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	344 Consider restructuring so that augmented assignment uses
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	345 set_context(), too.
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	346 */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	347 assert(ctx != AugStore && ctx != AugLoad);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	348
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	349 switch (e->kind) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	350 case Attribute_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	351 if (ctx == Store &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	352 !strcmp(PyString_AS_STRING(e->v.Attribute.attr), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	353 return ast_error(n, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	354 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	355 e->v.Attribute.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	356 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	357 case Subscript_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	358 e->v.Subscript.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	359 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	360 case Name_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	361 if (ctx == Store &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	362 !strcmp(PyString_AS_STRING(e->v.Name.id), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	363 return ast_error(n, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	364 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	365 e->v.Name.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	366 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	367 case List_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	368 e->v.List.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	369 s = e->v.List.elts;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	370 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	371 case Tuple_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	372 if (asdl_seq_LEN(e->v.Tuple.elts) == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	373 return ast_error(n, "can't assign to ()");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	374 e->v.Tuple.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	375 s = e->v.Tuple.elts;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	376 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	377 case Lambda_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	378 expr_name = "lambda";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	379 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	380 case Call_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	381 expr_name = "function call";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	382 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	383 case BoolOp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	384 case BinOp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	385 case UnaryOp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	386 expr_name = "operator";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	387 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	388 case GeneratorExp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	389 expr_name = "generator expression";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	390 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	391 case Yield_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	392 expr_name = "yield expression";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	393 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	394 case ListComp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	395 expr_name = "list comprehension";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	396 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	397 case Dict_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	398 case Num_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	399 case Str_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	400 expr_name = "literal";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	401 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	402 case Compare_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	403 expr_name = "comparison";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	404 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	405 case Repr_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	406 expr_name = "repr";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	407 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	408 case IfExp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	409 expr_name = "conditional expression";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	410 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	411 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	412 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	413 "unexpected expression in assignment %d (line %d)",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	414 e->kind, e->lineno);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	415 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	416 }
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	417 /* Check for error string set by switch */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	418 if (expr_name) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	419 char buf[300];
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	420 PyOS_snprintf(buf, sizeof(buf),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	421 "can't %s %s",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	422 ctx == Store ? "assign to" : "delete",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	423 expr_name);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	424 return ast_error(n, buf);
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	425 }
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	426
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	427 /* If the LHS is a list or tuple, we need to set the assignment
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	428 context for all the contained elements.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	429 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	430 if (s) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	431 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	432
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	433 for (i = 0; i < asdl_seq_LEN(s); i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	434 if (!set_context((expr_ty)asdl_seq_GET(s, i), ctx, n))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	435 return 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	436 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	437 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	438 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	439 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	440
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	441 static operator_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	442 ast_for_augassign(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	443 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	444 REQ(n, augassign);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	445 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	446 switch (STR(n)[0]) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	447 case '+':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	448 return Add;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	449 case '-':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	450 return Sub;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	451 case '/':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	452 if (STR(n)[1] == '/')
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	453 return FloorDiv;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	454 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	455 return Div;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	456 case '%':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	457 return Mod;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	458 case '<':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	459 return LShift;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	460 case '>':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	461 return RShift;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	462 case '&':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	463 return BitAnd;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	464 case '^':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	465 return BitXor;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	466 case '\|':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	467 return BitOr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	468 case '*':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	469 if (STR(n)[1] == '*')
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	470 return Pow;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	471 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	472 return Mult;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	473 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	474 PyErr_Format(PyExc_SystemError, "invalid augassign: %s", STR(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	475 return (operator_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	476 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	477 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	478
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	479 static cmpop_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	480 ast_for_comp_op(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	481 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	482 /* comp_op: '<'\|'>'\|'=='\|'>='\|'<='\|'<>'\|'!='\|'in'\|'not' 'in'\|'is'
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	483 \|'is' 'not'
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	484 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	485 REQ(n, comp_op);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	486 if (NCH(n) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	487 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	488 switch (TYPE(n)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	489 case LESS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	490 return Lt;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	491 case GREATER:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	492 return Gt;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	493 case EQEQUAL: /* == */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	494 return Eq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	495 case LESSEQUAL:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	496 return LtE;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	497 case GREATEREQUAL:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	498 return GtE;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	499 case NOTEQUAL:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	500 return NotEq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	501 case NAME:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	502 if (strcmp(STR(n), "in") == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	503 return In;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	504 if (strcmp(STR(n), "is") == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	505 return Is;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	506 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	507 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	508 STR(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	509 return (cmpop_ty)0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	510 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	511 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	512 else if (NCH(n) == 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	513 /* handle "not in" and "is not" */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	514 switch (TYPE(CHILD(n, 0))) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	515 case NAME:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	516 if (strcmp(STR(CHILD(n, 1)), "in") == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	517 return NotIn;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	518 if (strcmp(STR(CHILD(n, 0)), "is") == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	519 return IsNot;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	520 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	521 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s %s",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	522 STR(CHILD(n, 0)), STR(CHILD(n, 1)));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	523 return (cmpop_ty)0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	524 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	525 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	526 PyErr_Format(PyExc_SystemError, "invalid comp_op: has %d children",
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	527 NCH(n));
37604 c732f66c913f Convert 0 to their respective enum types. Convert Martin v. Löwis <martin@v.loewis.de> parents: 37597 diff changeset	528 return (cmpop_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	529 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	530
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	531 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	532 seq_for_testlist(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	533 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	534 /* testlist: test (',' test)* [','] */
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	535 asdl_seq *seq;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	536 expr_ty expression;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	537 int i;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	538 assert(TYPE(n) == testlist \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	539 TYPE(n) == listmaker \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	540 TYPE(n) == testlist_gexp \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	541 TYPE(n) == testlist_safe \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	542 TYPE(n) == testlist1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	543
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	544 seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	545 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	546 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	547
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	548 for (i = 0; i < NCH(n); i += 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	549 assert(TYPE(CHILD(n, i)) == test \|\| TYPE(CHILD(n, i)) == old_test);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	550
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	551 expression = ast_for_expr(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	552 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	553 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	554
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	555 assert(i / 2 < seq->size);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	556 asdl_seq_SET(seq, i / 2, expression);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	557 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	558 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	559 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	560
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	561 static expr_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	562 compiler_complex_args(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	563 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	564 int i, len = (NCH(n) + 1) / 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	565 expr_ty result;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	566 asdl_seq *args = asdl_seq_new(len, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	567 if (!args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	568 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	569
39872 b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). Neal Norwitz <nnorwitz@gmail.com> parents: 39779 diff changeset	570 /* fpdef: NAME \| '(' fplist ')'
b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). Neal Norwitz <nnorwitz@gmail.com> parents: 39779 diff changeset	571 fplist: fpdef (',' fpdef)* [',']
b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). Neal Norwitz <nnorwitz@gmail.com> parents: 39779 diff changeset	572 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	573 REQ(n, fplist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	574 for (i = 0; i < len; i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	575 const node fpdef_node = CHILD(n, 2i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	576 const node *child;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	577 expr_ty arg;
39872 b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). Neal Norwitz <nnorwitz@gmail.com> parents: 39779 diff changeset	578 set_name:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	579 /* fpdef_node is either a NAME or an fplist */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	580 child = CHILD(fpdef_node, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	581 if (TYPE(child) == NAME) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	582 if (!strcmp(STR(child), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	583 ast_error(child, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	584 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	585 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	586 arg = Name(NEW_IDENTIFIER(child), Store, LINENO(child),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	587 child->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	588 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	589 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	590 assert(TYPE(fpdef_node) == fpdef);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	591 /* fpdef_node[0] is not a name, so it must be '(', get CHILD[1] */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	592 child = CHILD(fpdef_node, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	593 assert(TYPE(child) == fplist);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	594 /* NCH == 1 means we have (x), we need to elide the extra parens */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	595 if (NCH(child) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	596 fpdef_node = CHILD(child, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	597 assert(TYPE(fpdef_node) == fpdef);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	598 goto set_name;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	599 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	600 arg = compiler_complex_args(c, child);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	601 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	602 asdl_seq_SET(args, i, arg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	603 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	604
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	605 result = Tuple(args, Store, LINENO(n), n->n_col_offset, c->c_arena);
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	606 if (!set_context(result, Store, n))
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	607 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	608 return result;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	609 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	610
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	611
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	612 /* Create AST for argument list. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	613
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	614 static arguments_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	615 ast_for_arguments(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	616 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	617 /* parameters: '(' [varargslist] ')'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	618 varargslist: (fpdef ['=' test] ',')* ('' NAME [',' '*' NAME]
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	619 \| '*' NAME) \| fpdef ['=' test] (',' fpdef ['=' test]) [',']
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	620 */
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	621 int i, j, k, n_args = 0, n_defaults = 0, found_default = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	622 asdl_seq args, defaults;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	623 identifier vararg = NULL, kwarg = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	624 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	625
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	626 if (TYPE(n) == parameters) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	627 if (NCH(n) == 2) /* () as argument list */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	628 return arguments(NULL, NULL, NULL, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	629 n = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	630 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	631 REQ(n, varargslist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	632
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	633 /* first count the number of normal args & defaults */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	634 for (i = 0; i < NCH(n); i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	635 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	636 if (TYPE(ch) == fpdef)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	637 n_args++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	638 if (TYPE(ch) == EQUAL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	639 n_defaults++;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	640 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	641 args = (n_args ? asdl_seq_new(n_args, c->c_arena) : NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	642 if (!args && n_args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	643 return NULL; /* Don't need to goto error; no objects allocated */
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	644 defaults = (n_defaults ? asdl_seq_new(n_defaults, c->c_arena) : NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	645 if (!defaults && n_defaults)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	646 return NULL; /* Don't need to goto error; no objects allocated */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	647
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	648 /* fpdef: NAME \| '(' fplist ')'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	649 fplist: fpdef (',' fpdef)* [',']
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	650 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	651 i = 0;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	652 j = 0; /* index for defaults */
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	653 k = 0; /* index for args */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	654 while (i < NCH(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	655 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	656 switch (TYPE(ch)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	657 case fpdef:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	658 handle_fpdef:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	659 /* XXX Need to worry about checking if TYPE(CHILD(n, i+1)) is
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	660 anything other than EQUAL or a comma? */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	661 /* XXX Should NCH(n) check be made a separate check? */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	662 if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	663 expr_ty expression = ast_for_expr(c, CHILD(n, i + 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	664 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	665 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	666 assert(defaults != NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	667 asdl_seq_SET(defaults, j++, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	668 i += 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	669 found_default = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	670 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	671 else if (found_default) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	672 ast_error(n,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	673 "non-default argument follows default argument");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	674 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	675 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	676 if (NCH(ch) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	677 ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	678 /* def foo((x)): is not complex, special case. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	679 if (NCH(ch) != 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	680 /* We have complex arguments, setup for unpacking. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	681 asdl_seq_SET(args, k++, compiler_complex_args(c, ch));
41579 7a4f174df844 Handle a couple of uncaught errors. This should be backported Neal Norwitz <nnorwitz@gmail.com> parents: 41578 diff changeset	682 if (!asdl_seq_GET(args, k-1))
7a4f174df844 Handle a couple of uncaught errors. This should be backported Neal Norwitz <nnorwitz@gmail.com> parents: 41578 diff changeset	683 goto error;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	684 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	685 /* def foo((x)): setup for checking NAME below. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	686 /* Loop because there can be many parens and tuple
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	687 unpacking mixed in. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	688 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	689 assert(TYPE(ch) == fpdef);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	690 goto handle_fpdef;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	691 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	692 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	693 if (TYPE(CHILD(ch, 0)) == NAME) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	694 expr_ty name;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	695 if (!strcmp(STR(CHILD(ch, 0)), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	696 ast_error(CHILD(ch, 0), "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	697 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	698 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	699 name = Name(NEW_IDENTIFIER(CHILD(ch, 0)),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	700 Param, LINENO(ch), ch->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	701 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	702 if (!name)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	703 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	704 asdl_seq_SET(args, k++, name);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	705
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	706 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	707 i += 2; /* the name and the comma */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	708 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	709 case STAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	710 if (!strcmp(STR(CHILD(n, i+1)), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	711 ast_error(CHILD(n, i+1), "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	712 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	713 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	714 vararg = NEW_IDENTIFIER(CHILD(n, i+1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	715 i += 3;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	716 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	717 case DOUBLESTAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	718 if (!strcmp(STR(CHILD(n, i+1)), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	719 ast_error(CHILD(n, i+1), "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	720 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	721 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	722 kwarg = NEW_IDENTIFIER(CHILD(n, i+1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	723 i += 3;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	724 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	725 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	726 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	727 "unexpected node in varargslist: %d @ %d",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	728 TYPE(ch), i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	729 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	730 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	731 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	732
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	733 return arguments(args, vararg, kwarg, defaults, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	734
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	735 error:
35873 76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	736 Py_XDECREF(vararg);
76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	737 Py_XDECREF(kwarg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	738 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	739 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	740
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	741 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	742 ast_for_dotted_name(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	743 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	744 expr_ty e;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	745 identifier id;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	746 int lineno, col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	747 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	748
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	749 REQ(n, dotted_name);
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	750
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	751 lineno = LINENO(n);
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	752 col_offset = n->n_col_offset;
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	753
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	754 id = NEW_IDENTIFIER(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	755 if (!id)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	756 return NULL;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	757 e = Name(id, Load, lineno, col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	758 if (!e)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	759 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	760
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	761 for (i = 2; i < NCH(n); i+=2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	762 id = NEW_IDENTIFIER(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	763 if (!id)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	764 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	765 e = Attribute(e, id, Load, lineno, col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	766 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	767 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	768 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	769
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	770 return e;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	771 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	772
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	773 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	774 ast_for_decorator(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	775 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	776 /* decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	777 expr_ty d = NULL;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	778 expr_ty name_expr;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	779
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	780 REQ(n, decorator);
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	781 REQ(CHILD(n, 0), AT);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	782 REQ(RCHILD(n, -1), NEWLINE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	783
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	784 name_expr = ast_for_dotted_name(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	785 if (!name_expr)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	786 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	787
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	788 if (NCH(n) == 3) { /* No arguments */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	789 d = name_expr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	790 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	791 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	792 else if (NCH(n) == 5) { /* Call with no arguments */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	793 d = Call(name_expr, NULL, NULL, NULL, NULL, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	794 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	795 if (!d)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	796 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	797 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	798 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	799 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	800 d = ast_for_call(c, CHILD(n, 3), name_expr);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	801 if (!d)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	802 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	803 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	804 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	805
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	806 return d;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	807 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	808
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	809 static asdl_seq*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	810 ast_for_decorators(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	811 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	812 asdl_seq* decorator_seq;
35873 76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	813 expr_ty d;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	814 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	815
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	816 REQ(n, decorators);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	817 decorator_seq = asdl_seq_new(NCH(n), c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	818 if (!decorator_seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	819 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	820
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	821 for (i = 0; i < NCH(n); i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	822 d = ast_for_decorator(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	823 if (!d)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	824 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	825 asdl_seq_SET(decorator_seq, i, d);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	826 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	827 return decorator_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	828 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	829
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	830 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	831 ast_for_funcdef(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	832 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	833 /* funcdef: 'def' [decorators] NAME parameters ':' suite */
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	834 identifier name;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	835 arguments_ty args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	836 asdl_seq *body;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	837 asdl_seq *decorator_seq = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	838 int name_i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	839
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	840 REQ(n, funcdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	841
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	842 if (NCH(n) == 6) { /* decorators are present */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	843 decorator_seq = ast_for_decorators(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	844 if (!decorator_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	845 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	846 name_i = 2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	847 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	848 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	849 name_i = 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	850 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	851
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	852 name = NEW_IDENTIFIER(CHILD(n, name_i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	853 if (!name)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	854 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	855 else if (!strcmp(STR(CHILD(n, name_i)), "None")) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	856 ast_error(CHILD(n, name_i), "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	857 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	858 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	859 args = ast_for_arguments(c, CHILD(n, name_i + 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	860 if (!args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	861 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	862 body = ast_for_suite(c, CHILD(n, name_i + 3));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	863 if (!body)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	864 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	865
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37235 diff changeset	866 return FunctionDef(name, args, body, decorator_seq, LINENO(n),
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	867 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	868 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	869
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	870 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	871 ast_for_lambdef(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	872 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	873 /* lambdef: 'lambda' [varargslist] ':' test */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	874 arguments_ty args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	875 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	876
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	877 if (NCH(n) == 3) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	878 args = arguments(NULL, NULL, NULL, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	879 if (!args)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	880 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	881 expression = ast_for_expr(c, CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	882 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	883 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	884 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	885 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	886 args = ast_for_arguments(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	887 if (!args)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	888 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	889 expression = ast_for_expr(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	890 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	891 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	892 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	893
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	894 return Lambda(args, expression, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	895 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	896
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	897 static expr_ty
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	898 ast_for_ifexpr(struct compiling c, const node n)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	899 {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	900 /* test: or_test 'if' or_test 'else' test */
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	901 expr_ty expression, body, orelse;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	902
36676 67c74efad8c2 Fix old not-reading-pep-308-right artifact. Thomas Wouters <thomas@python.org> parents: 36670 diff changeset	903 assert(NCH(n) == 5);
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	904 body = ast_for_expr(c, CHILD(n, 0));
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	905 if (!body)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	906 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	907 expression = ast_for_expr(c, CHILD(n, 2));
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	908 if (!expression)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	909 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	910 orelse = ast_for_expr(c, CHILD(n, 4));
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	911 if (!orelse)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	912 return NULL;
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37235 diff changeset	913 return IfExp(expression, body, orelse, LINENO(n), n->n_col_offset,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	914 c->c_arena);
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	915 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	916
39755 c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. Neal Norwitz <nnorwitz@gmail.com> parents: 39753 diff changeset	917 /* XXX(nnorwitz): the listcomp and genexpr code should be refactored
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. Neal Norwitz <nnorwitz@gmail.com> parents: 39753 diff changeset	918 so there is only a single version. Possibly for loops can also re-use
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. Neal Norwitz <nnorwitz@gmail.com> parents: 39753 diff changeset	919 the code.
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. Neal Norwitz <nnorwitz@gmail.com> parents: 39753 diff changeset	920 */
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. Neal Norwitz <nnorwitz@gmail.com> parents: 39753 diff changeset	921
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	922 /* Count the number of 'for' loop in a list comprehension.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	923
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	924 Helper for ast_for_listcomp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	925 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	926
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	927 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	928 count_list_fors(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	929 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	930 int n_fors = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	931 node *ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	932
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	933 count_list_for:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	934 n_fors++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	935 REQ(ch, list_for);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	936 if (NCH(ch) == 5)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	937 ch = CHILD(ch, 4);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	938 else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	939 return n_fors;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	940 count_list_iter:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	941 REQ(ch, list_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	942 ch = CHILD(ch, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	943 if (TYPE(ch) == list_for)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	944 goto count_list_for;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	945 else if (TYPE(ch) == list_if) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	946 if (NCH(ch) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	947 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	948 goto count_list_iter;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	949 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	950 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	951 return n_fors;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	952 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	953
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	954 /* Should never be reached */
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	955 PyErr_SetString(PyExc_SystemError, "logic error in count_list_fors");
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	956 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	957 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	958
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	959 /* Count the number of 'if' statements in a list comprehension.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	960
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	961 Helper for ast_for_listcomp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	962 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	963
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	964 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	965 count_list_ifs(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	966 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	967 int n_ifs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	968
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	969 count_list_iter:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	970 REQ(n, list_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	971 if (TYPE(CHILD(n, 0)) == list_for)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	972 return n_ifs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	973 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	974 REQ(n, list_if);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	975 n_ifs++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	976 if (NCH(n) == 2)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	977 return n_ifs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	978 n = CHILD(n, 2);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	979 goto count_list_iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	980 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	981
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	982 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	983 ast_for_listcomp(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	984 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	985 /* listmaker: test ( list_for \| (',' test)* [','] )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	986 list_for: 'for' exprlist 'in' testlist_safe [list_iter]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	987 list_iter: list_for \| list_if
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	988 list_if: 'if' test [list_iter]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	989 testlist_safe: test [(',' test)+ [',']]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	990 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	991 expr_ty elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	992 asdl_seq *listcomps;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	993 int i, n_fors;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	994 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	995
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	996 REQ(n, listmaker);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	997 assert(NCH(n) > 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	998
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	999 elt = ast_for_expr(c, CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1000 if (!elt)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1001 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1002
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1003 n_fors = count_list_fors(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1004 if (n_fors == -1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1005 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1006
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1007 listcomps = asdl_seq_new(n_fors, c->c_arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1008 if (!listcomps)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1009 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1010
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1011 ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1012 for (i = 0; i < n_fors; i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1013 comprehension_ty lc;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1014 asdl_seq *t;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1015 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1016 node *for_ch;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1017
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1018 REQ(ch, list_for);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1019
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1020 for_ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1021 t = ast_for_exprlist(c, for_ch, Store);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1022 if (!t)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1023 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1024 expression = ast_for_testlist(c, CHILD(ch, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1025 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1026 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1027
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1028 /* Check the # of children rather than the length of t, since
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1029 [x for x, in ... ] has 1 element in t, but still requires a Tuple.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1030 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1031 if (NCH(for_ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1032 lc = comprehension((expr_ty)asdl_seq_GET(t, 0), expression, NULL,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1033 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1034 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1035 lc = comprehension(Tuple(t, Store, LINENO(ch), ch->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1036 c->c_arena),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1037 expression, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1038 if (!lc)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1039 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1040
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1041 if (NCH(ch) == 5) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1042 int j, n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1043 asdl_seq *ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1044 expr_ty list_for_expr;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1045
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1046 ch = CHILD(ch, 4);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1047 n_ifs = count_list_ifs(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1048 if (n_ifs == -1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1049 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1050
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1051 ifs = asdl_seq_new(n_ifs, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1052 if (!ifs)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1053 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1054
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1055 for (j = 0; j < n_ifs; j++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1056 REQ(ch, list_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1057 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1058 REQ(ch, list_if);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1059
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1060 list_for_expr = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1061 if (!list_for_expr)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1062 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1063
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1064 asdl_seq_SET(ifs, j, list_for_expr);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1065 if (NCH(ch) == 3)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1066 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1067 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1068 /* on exit, must guarantee that ch is a list_for */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1069 if (TYPE(ch) == list_iter)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1070 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1071 lc->ifs = ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1072 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1073 asdl_seq_SET(listcomps, i, lc);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1074 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1075
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1076 return ListComp(elt, listcomps, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1077 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1078
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1079 /* Count the number of 'for' loops in a generator expression.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1080
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1081 Helper for ast_for_genexp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1082 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1083
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1084 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1085 count_gen_fors(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1086 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1087 int n_fors = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1088 node *ch = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1089
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1090 count_gen_for:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1091 n_fors++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1092 REQ(ch, gen_for);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1093 if (NCH(ch) == 5)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1094 ch = CHILD(ch, 4);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1095 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1096 return n_fors;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1097 count_gen_iter:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1098 REQ(ch, gen_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1099 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1100 if (TYPE(ch) == gen_for)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1101 goto count_gen_for;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1102 else if (TYPE(ch) == gen_if) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1103 if (NCH(ch) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1104 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1105 goto count_gen_iter;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1106 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1107 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1108 return n_fors;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1109 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1110
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1111 /* Should never be reached */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1112 PyErr_SetString(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1113 "logic error in count_gen_fors");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1114 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1115 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1116
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1117 /* Count the number of 'if' statements in a generator expression.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1118
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1119 Helper for ast_for_genexp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1120 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1121
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1122 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1123 count_gen_ifs(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1124 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1125 int n_ifs = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1126
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1127 while (1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1128 REQ(n, gen_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1129 if (TYPE(CHILD(n, 0)) == gen_for)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1130 return n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1131 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1132 REQ(n, gen_if);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1133 n_ifs++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1134 if (NCH(n) == 2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1135 return n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1136 n = CHILD(n, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1137 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1138 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1139
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1140 /* TODO(jhylton): Combine with list comprehension code? */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1141 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1142 ast_for_genexp(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1143 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1144 /* testlist_gexp: test ( gen_for \| (',' test)* [','] )
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1145 argument: [test '='] test [gen_for] # Really [keyword '='] test */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1146 expr_ty elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1147 asdl_seq *genexps;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1148 int i, n_fors;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1149 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1150
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1151 assert(TYPE(n) == (testlist_gexp) \|\| TYPE(n) == (argument));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1152 assert(NCH(n) > 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1153
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1154 elt = ast_for_expr(c, CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1155 if (!elt)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1156 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1157
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1158 n_fors = count_gen_fors(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1159 if (n_fors == -1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1160 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1161
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1162 genexps = asdl_seq_new(n_fors, c->c_arena);
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1163 if (!genexps)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1164 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1165
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1166 ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1167 for (i = 0; i < n_fors; i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1168 comprehension_ty ge;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1169 asdl_seq *t;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1170 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1171 node *for_ch;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1172
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1173 REQ(ch, gen_for);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1174
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1175 for_ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1176 t = ast_for_exprlist(c, for_ch, Store);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1177 if (!t)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1178 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1179 expression = ast_for_expr(c, CHILD(ch, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1180 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1181 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1182
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1183 /* Check the # of children rather than the length of t, since
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1184 (x for x, in ...) has 1 element in t, but still requires a Tuple. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1185 if (NCH(for_ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1186 ge = comprehension((expr_ty)asdl_seq_GET(t, 0), expression,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1187 NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1188 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1189 ge = comprehension(Tuple(t, Store, LINENO(ch), ch->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1190 c->c_arena),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1191 expression, NULL, c->c_arena);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1192
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1193 if (!ge)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1194 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1195
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1196 if (NCH(ch) == 5) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1197 int j, n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1198 asdl_seq *ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1199
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1200 ch = CHILD(ch, 4);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1201 n_ifs = count_gen_ifs(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1202 if (n_ifs == -1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1203 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1204
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1205 ifs = asdl_seq_new(n_ifs, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1206 if (!ifs)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1207 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1208
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1209 for (j = 0; j < n_ifs; j++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1210 REQ(ch, gen_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1211 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1212 REQ(ch, gen_if);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1213
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1214 expression = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1215 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1216 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1217 asdl_seq_SET(ifs, j, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1218 if (NCH(ch) == 3)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1219 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1220 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1221 /* on exit, must guarantee that ch is a gen_for */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1222 if (TYPE(ch) == gen_iter)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1223 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1224 ge->ifs = ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1225 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1226 asdl_seq_SET(genexps, i, ge);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1227 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1228
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1229 return GeneratorExp(elt, genexps, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1230 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1231
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1232 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1233 ast_for_atom(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1234 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1235 /* atom: '(' [yield_expr\|testlist_gexp] ')' \| '[' [listmaker] ']'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1236 \| '{' [dictmaker] '}' \| '`' testlist '`' \| NAME \| NUMBER \| STRING+
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1237 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1238 node *ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1239
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1240 switch (TYPE(ch)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1241 case NAME:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1242 /* All names start in Load context, but may later be
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1243 changed. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1244 return Name(NEW_IDENTIFIER(ch), Load, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1245 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1246 case STRING: {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1247 PyObject *str = parsestrplus(c, n);
42308 6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1248 if (!str) {
44572 db5e01c33eb7 Make Python compile with --disable-unicode. Georg Brandl <georg@python.org> parents: 43997 diff changeset	1249 #ifdef Py_USING_UNICODE
42308 6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1250 if (PyErr_ExceptionMatches(PyExc_UnicodeError)){
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1251 PyObject type, value, tback, errstr;
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1252 PyErr_Fetch(&type, &value, &tback);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1253 errstr = ((PyUnicodeErrorObject *)value)->reason;
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1254 if (errstr) {
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1255 char *s = "";
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1256 char buf[128];
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1257 s = PyString_AsString(errstr);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1258 PyOS_snprintf(buf, sizeof(buf), "(unicode error) %s", s);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1259 ast_error(n, buf);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1260 } else {
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1261 ast_error(n, "(unicode error) unknown error");
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1262 }
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1263 Py_DECREF(type);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1264 Py_DECREF(value);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1265 Py_XDECREF(tback);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1266 }
44572 db5e01c33eb7 Make Python compile with --disable-unicode. Georg Brandl <georg@python.org> parents: 43997 diff changeset	1267 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1268 return NULL;
42308 6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1269 }
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1270 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1271 return Str(str, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1272 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1273 case NUMBER: {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1274 PyObject *pynum = parsenumber(STR(ch));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1275 if (!pynum)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1276 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1277
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1278 PyArena_AddPyObject(c->c_arena, pynum);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1279 return Num(pynum, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1280 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1281 case LPAR: /* some parenthesized expressions */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1282 ch = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1283
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1284 if (TYPE(ch) == RPAR)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1285 return Tuple(NULL, Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1286
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1287 if (TYPE(ch) == yield_expr)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1288 return ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1289
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1290 if ((NCH(ch) > 1) && (TYPE(CHILD(ch, 1)) == gen_for))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1291 return ast_for_genexp(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1292
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1293 return ast_for_testlist_gexp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1294 case LSQB: /* list (or list comprehension) */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1295 ch = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1296
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1297 if (TYPE(ch) == RSQB)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1298 return List(NULL, Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1299
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1300 REQ(ch, listmaker);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1301 if (NCH(ch) == 1 \|\| TYPE(CHILD(ch, 1)) == COMMA) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1302 asdl_seq *elts = seq_for_testlist(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1303 if (!elts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1304 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1305
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1306 return List(elts, Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1307 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1308 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1309 return ast_for_listcomp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1310 case LBRACE: {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1311 /* dictmaker: test ':' test (',' test ':' test)* [','] */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1312 int i, size;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1313 asdl_seq keys, values;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1314
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1315 ch = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1316 size = (NCH(ch) + 1) / 4; /* +1 in case no trailing comma */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1317 keys = asdl_seq_new(size, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1318 if (!keys)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1319 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1320
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1321 values = asdl_seq_new(size, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1322 if (!values)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1323 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1324
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1325 for (i = 0; i < NCH(ch); i += 4) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1326 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1327
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1328 expression = ast_for_expr(c, CHILD(ch, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1329 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1330 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1331
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1332 asdl_seq_SET(keys, i / 4, expression);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1333
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1334 expression = ast_for_expr(c, CHILD(ch, i + 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1335 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1336 return NULL;
35873 76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	1337
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1338 asdl_seq_SET(values, i / 4, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1339 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1340 return Dict(keys, values, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1341 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1342 case BACKQUOTE: { /* repr */
43985 2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1343 expr_ty expression;
43983 e725166c8c81 Fixed problems in the last commit. Filenames and line numbers weren't reported correctly. Christian Heimes <christian@cheimes.de> parents: 43982 diff changeset	1344 if (Py_Py3kWarningFlag) {
43985 2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1345 if (PyErr_WarnExplicit(PyExc_DeprecationWarning,
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1346 "backquote not supported in 3.x",
43997 17479a09ec7c Added filename to compiling struct based on Martin's suggestion. Christian Heimes <christian@cheimes.de> parents: 43985 diff changeset	1347 c->c_filename, LINENO(n),
43985 2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1348 NULL, NULL)) {
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1349 return NULL;
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1350 }
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1351 }
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1352 expression = ast_for_testlist(c, CHILD(n, 1));
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1353 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1354 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1355
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1356 return Repr(expression, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1357 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1358 default:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1359 PyErr_Format(PyExc_SystemError, "unhandled atom %d", TYPE(ch));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1360 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1361 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1362 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1363
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1364 static slice_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1365 ast_for_slice(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1366 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1367 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1368 expr_ty lower = NULL, upper = NULL, step = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1369
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1370 REQ(n, subscript);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1371
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1372 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1373 subscript: '.' '.' '.' \| test \| [test] ':' [test] [sliceop]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1374 sliceop: ':' [test]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1375 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1376 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1377 if (TYPE(ch) == DOT)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1378 return Ellipsis(c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1379
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1380 if (NCH(n) == 1 && TYPE(ch) == test) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1381 /* 'step' variable hold no significance in terms of being used over
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1382 other vars */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1383 step = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1384 if (!step)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1385 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1386
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1387 return Index(step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1388 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1389
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1390 if (TYPE(ch) == test) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1391 lower = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1392 if (!lower)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1393 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1394 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1395
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1396 /* If there's an upper bound it's in the second or third position. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1397 if (TYPE(ch) == COLON) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1398 if (NCH(n) > 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1399 node *n2 = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1400
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1401 if (TYPE(n2) == test) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1402 upper = ast_for_expr(c, n2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1403 if (!upper)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1404 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1405 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1406 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1407 } else if (NCH(n) > 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1408 node *n2 = CHILD(n, 2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1409
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1410 if (TYPE(n2) == test) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1411 upper = ast_for_expr(c, n2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1412 if (!upper)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1413 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1414 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1415 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1416
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1417 ch = CHILD(n, NCH(n) - 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1418 if (TYPE(ch) == sliceop) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1419 if (NCH(ch) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1420 /* No expression, so step is None */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1421 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1422 step = Name(new_identifier("None", c->c_arena), Load,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1423 LINENO(ch), ch->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1424 if (!step)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1425 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1426 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1427 ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1428 if (TYPE(ch) == test) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1429 step = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1430 if (!step)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1431 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1432 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1433 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1434 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1435
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1436 return Slice(lower, upper, step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1437 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1438
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1439 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1440 ast_for_binop(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1441 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1442 /* Must account for a sequence of expressions.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1443 How should A op B op C by represented?
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1444 BinOp(BinOp(A, op, B), op, C).
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1445 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1446
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1447 int i, nops;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1448 expr_ty expr1, expr2, result;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1449 operator_ty newoperator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1450
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1451 expr1 = ast_for_expr(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1452 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1453 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1454
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1455 expr2 = ast_for_expr(c, CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1456 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1457 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1458
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1459 newoperator = get_operator(CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1460 if (!newoperator)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1461 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1462
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1463 result = BinOp(expr1, newoperator, expr2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1464 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1465 if (!result)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1466 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1467
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1468 nops = (NCH(n) - 1) / 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1469 for (i = 1; i < nops; i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1470 expr_ty tmp_result, tmp;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1471 const node* next_oper = CHILD(n, i * 2 + 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1472
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1473 newoperator = get_operator(next_oper);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1474 if (!newoperator)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1475 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1476
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1477 tmp = ast_for_expr(c, CHILD(n, i * 2 + 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1478 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1479 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1480
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1481 tmp_result = BinOp(result, newoperator, tmp,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1482 LINENO(next_oper), next_oper->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1483 c->c_arena);
43470 995677219a65 Fix Coverity #158: Check the correct variable. Neal Norwitz <nnorwitz@gmail.com> parents: 42459 diff changeset	1484 if (!tmp_result)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1485 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1486 result = tmp_result;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1487 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1488 return result;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1489 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1490
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1491 static expr_ty
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1492 ast_for_trailer(struct compiling c, const node n, expr_ty left_expr)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1493 {
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1494 /* trailer: '(' [arglist] ')' \| '[' subscriptlist ']' \| '.' NAME
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1495 subscriptlist: subscript (',' subscript)* [',']
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1496 subscript: '.' '.' '.' \| test \| [test] ':' [test] [sliceop]
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1497 */
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1498 REQ(n, trailer);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1499 if (TYPE(CHILD(n, 0)) == LPAR) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1500 if (NCH(n) == 2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1501 return Call(left_expr, NULL, NULL, NULL, NULL, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1502 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1503 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1504 return ast_for_call(c, CHILD(n, 1), left_expr);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1505 }
36679 e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1506 else if (TYPE(CHILD(n, 0)) == DOT ) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1507 return Attribute(left_expr, NEW_IDENTIFIER(CHILD(n, 1)), Load,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1508 LINENO(n), n->n_col_offset, c->c_arena);
36679 e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1509 }
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1510 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1511 REQ(CHILD(n, 0), LSQB);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1512 REQ(CHILD(n, 2), RSQB);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1513 n = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1514 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1515 slice_ty slc = ast_for_slice(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1516 if (!slc)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1517 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1518 return Subscript(left_expr, slc, Load, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1519 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1520 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1521 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1522 /* The grammar is ambiguous here. The ambiguity is resolved
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1523 by treating the sequence as a tuple literal if there are
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1524 no slice features.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1525 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1526 int j;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1527 slice_ty slc;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1528 expr_ty e;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1529 bool simple = true;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1530 asdl_seq slices, elts;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1531 slices = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1532 if (!slices)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1533 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1534 for (j = 0; j < NCH(n); j += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1535 slc = ast_for_slice(c, CHILD(n, j));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1536 if (!slc)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1537 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1538 if (slc->kind != Index_kind)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1539 simple = false;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1540 asdl_seq_SET(slices, j / 2, slc);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1541 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1542 if (!simple) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1543 return Subscript(left_expr, ExtSlice(slices, c->c_arena),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1544 Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1545 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1546 /* extract Index values and put them in a Tuple */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1547 elts = asdl_seq_new(asdl_seq_LEN(slices), c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1548 if (!elts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1549 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1550 for (j = 0; j < asdl_seq_LEN(slices); ++j) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1551 slc = (slice_ty)asdl_seq_GET(slices, j);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1552 assert(slc->kind == Index_kind && slc->v.Index.value);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1553 asdl_seq_SET(elts, j, slc->v.Index.value);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1554 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1555 e = Tuple(elts, Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1556 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1557 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1558 return Subscript(left_expr, Index(e, c->c_arena),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1559 Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1560 }
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1561 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1562 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1563
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1564 static expr_ty
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1565 ast_for_factor(struct compiling c, const node n)
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1566 {
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1567 node pfactor, ppower, patom, pnum;
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1568 expr_ty expression;
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1569
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1570 /* If the unary - operator is applied to a constant, don't generate
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1571 a UNARY_NEGATIVE opcode. Just store the approriate value as a
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1572 constant. The peephole optimizer already does something like
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1573 this but it doesn't handle the case where the constant is
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1574 (sys.maxint - 1). In that case, we want a PyIntObject, not a
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1575 PyLongObject.
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1576 */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1577 if (TYPE(CHILD(n, 0)) == MINUS &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1578 NCH(n) == 2 &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1579 TYPE((pfactor = CHILD(n, 1))) == factor &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1580 NCH(pfactor) == 1 &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1581 TYPE((ppower = CHILD(pfactor, 0))) == power &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1582 NCH(ppower) == 1 &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1583 TYPE((patom = CHILD(ppower, 0))) == atom &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1584 TYPE((pnum = CHILD(patom, 0))) == NUMBER) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1585 char *s = PyObject_MALLOC(strlen(STR(pnum)) + 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1586 if (s == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1587 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1588 s[0] = '-';
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1589 strcpy(s + 1, STR(pnum));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1590 PyObject_FREE(STR(pnum));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1591 STR(pnum) = s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1592 return ast_for_atom(c, patom);
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1593 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1594
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1595 expression = ast_for_expr(c, CHILD(n, 1));
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1596 if (!expression)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1597 return NULL;
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1598
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1599 switch (TYPE(CHILD(n, 0))) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1600 case PLUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1601 return UnaryOp(UAdd, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1602 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1603 case MINUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1604 return UnaryOp(USub, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1605 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1606 case TILDE:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1607 return UnaryOp(Invert, expression, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1608 n->n_col_offset, c->c_arena);
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1609 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1610 PyErr_Format(PyExc_SystemError, "unhandled factor: %d",
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1611 TYPE(CHILD(n, 0)));
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1612 return NULL;
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1613 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1614
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1615 static expr_ty
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1616 ast_for_power(struct compiling c, const node n)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1617 {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1618 /* power: atom trailer* ('*' factor)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1619 */
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1620 int i;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1621 expr_ty e, tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1622 REQ(n, power);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1623 e = ast_for_atom(c, CHILD(n, 0));
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1624 if (!e)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1625 return NULL;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1626 if (NCH(n) == 1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1627 return e;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1628 for (i = 1; i < NCH(n); i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1629 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1630 if (TYPE(ch) != trailer)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1631 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1632 tmp = ast_for_trailer(c, ch, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1633 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1634 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1635 tmp->lineno = e->lineno;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1636 tmp->col_offset = e->col_offset;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1637 e = tmp;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1638 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1639 if (TYPE(CHILD(n, NCH(n) - 1)) == factor) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1640 expr_ty f = ast_for_expr(c, CHILD(n, NCH(n) - 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1641 if (!f)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1642 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1643 tmp = BinOp(e, Pow, f, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1644 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1645 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1646 e = tmp;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1647 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1648 return e;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1649 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1650
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1651 /* Do not name a variable 'expr'! Will cause a compile error.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1652 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1653
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1654 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1655 ast_for_expr(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1656 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1657 /* handle the full range of simple expressions
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1658 test: or_test ['if' or_test 'else' test] \| lambdef
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1659 or_test: and_test ('or' and_test)*
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1660 and_test: not_test ('and' not_test)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1661 not_test: 'not' not_test \| comparison
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1662 comparison: expr (comp_op expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1663 expr: xor_expr ('\|' xor_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1664 xor_expr: and_expr ('^' and_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1665 and_expr: shift_expr ('&' shift_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1666 shift_expr: arith_expr (('<<'\|'>>') arith_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1667 arith_expr: term (('+'\|'-') term)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1668 term: factor ((''\|'/'\|'%'\|'//') factor)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1669 factor: ('+'\|'-'\|'~') factor \| power
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1670 power: atom trailer* ('*' factor)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1671
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1672 As well as modified versions that exist for backward compatibility,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1673 to explicitly allow:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1674 [ x for x in lambda: 0, lambda: 1 ]
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1675 (which would be ambiguous without these extra rules)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1676
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1677 old_test: or_test \| old_lambdef
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1678 old_lambdef: 'lambda' [vararglist] ':' old_test
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1679
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1680 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1681
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1682 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1683 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1684
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1685 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1686 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1687 case test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1688 case old_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1689 if (TYPE(CHILD(n, 0)) == lambdef \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1690 TYPE(CHILD(n, 0)) == old_lambdef)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1691 return ast_for_lambdef(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1692 else if (NCH(n) > 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1693 return ast_for_ifexpr(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1694 /* Fallthrough */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1695 case or_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1696 case and_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1697 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1698 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1699 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1700 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1701 seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1702 if (!seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1703 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1704 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1705 expr_ty e = ast_for_expr(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1706 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1707 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1708 asdl_seq_SET(seq, i / 2, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1709 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1710 if (!strcmp(STR(CHILD(n, 1)), "and"))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1711 return BoolOp(And, seq, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1712 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1713 assert(!strcmp(STR(CHILD(n, 1)), "or"));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1714 return BoolOp(Or, seq, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1715 case not_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1716 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1717 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1718 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1719 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1720 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1721 expr_ty expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1722 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1723 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1724
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1725 return UnaryOp(Not, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1726 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1727 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1728 case comparison:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1729 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1730 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1731 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1732 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1733 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1734 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1735 asdl_int_seq *ops;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1736 asdl_seq *cmps;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1737 ops = asdl_int_seq_new(NCH(n) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1738 if (!ops)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1739 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1740 cmps = asdl_seq_new(NCH(n) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1741 if (!cmps) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1742 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1743 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1744 for (i = 1; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1745 cmpop_ty newoperator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1746
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1747 newoperator = ast_for_comp_op(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1748 if (!newoperator) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1749 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1750 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1751
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1752 expression = ast_for_expr(c, CHILD(n, i + 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1753 if (!expression) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1754 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1755 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1756
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1757 asdl_seq_SET(ops, i / 2, newoperator);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1758 asdl_seq_SET(cmps, i / 2, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1759 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1760 expression = ast_for_expr(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1761 if (!expression) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1762 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1763 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1764
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1765 return Compare(expression, ops, cmps, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1766 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1767 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1768 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1769
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1770 /* The next five cases all handle BinOps. The main body of code
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1771 is the same in each case, but the switch turned inside out to
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1772 reuse the code for each type of operator.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1773 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1774 case expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1775 case xor_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1776 case and_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1777 case shift_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1778 case arith_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1779 case term:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1780 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1781 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1782 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1783 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1784 return ast_for_binop(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1785 case yield_expr: {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1786 expr_ty exp = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1787 if (NCH(n) == 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1788 exp = ast_for_testlist(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1789 if (!exp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1790 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1791 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1792 return Yield(exp, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1793 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1794 case factor:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1795 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1796 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1797 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1798 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1799 return ast_for_factor(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1800 case power:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1801 return ast_for_power(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1802 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1803 PyErr_Format(PyExc_SystemError, "unhandled expr: %d", TYPE(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1804 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1805 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1806 /* should never get here unless if error is set */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1807 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1808 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1809
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1810 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1811 ast_for_call(struct compiling c, const node n, expr_ty func)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1812 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1813 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1814 arglist: (argument ',')* (argument [',']\| '' test [',' '*' test]
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1815 \| '**' test)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1816 argument: [test '='] test [gen_for] # Really [keyword '='] test
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1817 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1818
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1819 int i, nargs, nkeywords, ngens;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1820 asdl_seq *args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1821 asdl_seq *keywords;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1822 expr_ty vararg = NULL, kwarg = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1823
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1824 REQ(n, arglist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1825
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1826 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1827 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1828 ngens = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1829 for (i = 0; i < NCH(n); i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1830 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1831 if (TYPE(ch) == argument) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1832 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1833 nargs++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1834 else if (TYPE(CHILD(ch, 1)) == gen_for)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1835 ngens++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1836 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1837 nkeywords++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1838 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1839 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1840 if (ngens > 1 \|\| (ngens && (nargs \|\| nkeywords))) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1841 ast_error(n, "Generator expression must be parenthesized "
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1842 "if not sole argument");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1843 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1844 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1845
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1846 if (nargs + nkeywords + ngens > 255) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1847 ast_error(n, "more than 255 arguments");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1848 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1849 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1850
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1851 args = asdl_seq_new(nargs + ngens, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1852 if (!args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1853 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1854 keywords = asdl_seq_new(nkeywords, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1855 if (!keywords)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1856 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1857 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1858 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1859 for (i = 0; i < NCH(n); i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1860 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1861 if (TYPE(ch) == argument) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1862 expr_ty e;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1863 if (NCH(ch) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1864 if (nkeywords) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1865 ast_error(CHILD(ch, 0),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1866 "non-keyword arg after keyword arg");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1867 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1868 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1869 e = ast_for_expr(c, CHILD(ch, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1870 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1871 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1872 asdl_seq_SET(args, nargs++, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1873 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1874 else if (TYPE(CHILD(ch, 1)) == gen_for) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1875 e = ast_for_genexp(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1876 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1877 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1878 asdl_seq_SET(args, nargs++, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1879 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1880 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1881 keyword_ty kw;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1882 identifier key;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1883
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1884 /* CHILD(ch, 0) is test, but must be an identifier? */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1885 e = ast_for_expr(c, CHILD(ch, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1886 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1887 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1888 /* f(lambda x: x[0] = 3) ends up getting parsed with
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1889 * LHS test = lambda x: x[0], and RHS test = 3.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1890 * SF bug 132313 points out that complaining about a keyword
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1891 * then is very confusing.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1892 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1893 if (e->kind == Lambda_kind) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1894 ast_error(CHILD(ch, 0),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1895 "lambda cannot contain assignment");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1896 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1897 } else if (e->kind != Name_kind) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1898 ast_error(CHILD(ch, 0), "keyword can't be an expression");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1899 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1900 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1901 key = e->v.Name.id;
41974 c8b0e3b8b456 Disallow function calls like foo(None=1). Georg Brandl <georg@python.org> parents: 41773 diff changeset	1902 if (!strcmp(PyString_AS_STRING(key), "None")) {
c8b0e3b8b456 Disallow function calls like foo(None=1). Georg Brandl <georg@python.org> parents: 41773 diff changeset	1903 ast_error(CHILD(ch, 0), "assignment to None");
c8b0e3b8b456 Disallow function calls like foo(None=1). Georg Brandl <georg@python.org> parents: 41773 diff changeset	1904 return NULL;
c8b0e3b8b456 Disallow function calls like foo(None=1). Georg Brandl <georg@python.org> parents: 41773 diff changeset	1905 }
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1906 e = ast_for_expr(c, CHILD(ch, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1907 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1908 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1909 kw = keyword(key, e, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1910 if (!kw)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1911 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1912 asdl_seq_SET(keywords, nkeywords++, kw);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1913 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1914 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1915 else if (TYPE(ch) == STAR) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1916 vararg = ast_for_expr(c, CHILD(n, i+1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1917 i++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1918 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1919 else if (TYPE(ch) == DOUBLESTAR) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1920 kwarg = ast_for_expr(c, CHILD(n, i+1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1921 i++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1922 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1923 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1924
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1925 return Call(func, args, keywords, vararg, kwarg, func->lineno,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1926 func->col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1927 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1928
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1929 static expr_ty
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1930 ast_for_testlist(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1931 {
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1932 /* testlist_gexp: test (',' test)* [','] */
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1933 /* testlist: test (',' test)* [','] */
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1934 /* testlist_safe: test (',' test)+ [','] */
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1935 /* testlist1: test (',' test)* */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1936 assert(NCH(n) > 0);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1937 if (TYPE(n) == testlist_gexp) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1938 if (NCH(n) > 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1939 assert(TYPE(CHILD(n, 1)) != gen_for);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1940 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1941 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1942 assert(TYPE(n) == testlist \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1943 TYPE(n) == testlist_safe \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1944 TYPE(n) == testlist1);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1945 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1946 if (NCH(n) == 1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1947 return ast_for_expr(c, CHILD(n, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1948 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1949 asdl_seq *tmp = seq_for_testlist(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1950 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1951 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1952 return Tuple(tmp, Load, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1953 }
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1954 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1955
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1956 static expr_ty
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1957 ast_for_testlist_gexp(struct compiling c, const node n)
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1958 {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1959 /* testlist_gexp: test ( gen_for \| (',' test)* [','] ) */
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1960 /* argument: test [ gen_for ] */
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1961 assert(TYPE(n) == testlist_gexp \|\| TYPE(n) == argument);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1962 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == gen_for)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1963 return ast_for_genexp(c, n);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1964 return ast_for_testlist(c, n);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1965 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1966
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1967 /* like ast_for_testlist() but returns a sequence */
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1968 static asdl_seq*
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1969 ast_for_class_bases(struct compiling c, const node n)
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1970 {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1971 /* testlist: test (',' test)* [','] */
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1972 assert(NCH(n) > 0);
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1973 REQ(n, testlist);
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1974 if (NCH(n) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1975 expr_ty base;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1976 asdl_seq *bases = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1977 if (!bases)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1978 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1979 base = ast_for_expr(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1980 if (!base)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1981 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1982 asdl_seq_SET(bases, 0, base);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1983 return bases;
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1984 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1985
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1986 return seq_for_testlist(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1987 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1988
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1989 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1990 ast_for_expr_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1991 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1992 REQ(n, expr_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1993 /* expr_stmt: testlist (augassign (yield_expr\|testlist)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1994 \| ('=' (yield_expr\|testlist))*)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1995 testlist: test (',' test)* [',']
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1996 augassign: '+=' \| '-=' \| '*=' \| '/=' \| '%=' \| '&=' \| '\|=' \| '^='
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1997 \| '<<=' \| '>>=' \| '**=' \| '//='
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1998 test: ... here starts the operator precendence dance
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1999 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2000
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2001 if (NCH(n) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2002 expr_ty e = ast_for_testlist(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2003 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2004 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2005
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2006 return Expr(e, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2007 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2008 else if (TYPE(CHILD(n, 1)) == augassign) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2009 expr_ty expr1, expr2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2010 operator_ty newoperator;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2011 node *ch = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2012
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2013 expr1 = ast_for_testlist(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2014 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2015 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2016 /* TODO(nas): Remove duplicated error checks (set_context does it) */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2017 switch (expr1->kind) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2018 case GeneratorExp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2019 ast_error(ch, "augmented assignment to generator "
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2020 "expression not possible");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2021 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2022 case Yield_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2023 ast_error(ch, "augmented assignment to yield "
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2024 "expression not possible");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2025 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2026 case Name_kind: {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2027 const char *var_name = PyString_AS_STRING(expr1->v.Name.id);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2028 if (var_name[0] == 'N' && !strcmp(var_name, "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2029 ast_error(ch, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2030 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2031 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2032 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2033 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2034 case Attribute_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2035 case Subscript_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2036 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2037 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2038 ast_error(ch, "illegal expression for augmented "
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2039 "assignment");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2040 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2041 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2042 if(!set_context(expr1, Store, ch))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2043 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2044
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2045 ch = CHILD(n, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2046 if (TYPE(ch) == testlist)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2047 expr2 = ast_for_testlist(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2048 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2049 expr2 = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2050 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2051 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2052
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2053 newoperator = ast_for_augassign(CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2054 if (!newoperator)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2055 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2056
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2057 return AugAssign(expr1, newoperator, expr2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2058 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2059 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2060 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2061 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2062 asdl_seq *targets;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2063 node *value;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2064 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2065
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2066 /* a normal assignment */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2067 REQ(CHILD(n, 1), EQUAL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2068 targets = asdl_seq_new(NCH(n) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2069 if (!targets)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2070 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2071 for (i = 0; i < NCH(n) - 2; i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2072 expr_ty e;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2073 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2074 if (TYPE(ch) == yield_expr) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2075 ast_error(ch, "assignment to yield expression not possible");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2076 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2077 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2078 e = ast_for_testlist(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2079
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2080 /* set context to assign */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2081 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2082 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2083
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2084 if (!set_context(e, Store, CHILD(n, i)))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2085 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2086
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2087 asdl_seq_SET(targets, i / 2, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2088 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2089 value = CHILD(n, NCH(n) - 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2090 if (TYPE(value) == testlist)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2091 expression = ast_for_testlist(c, value);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2092 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2093 expression = ast_for_expr(c, value);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2094 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2095 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2096 return Assign(targets, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2097 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2098 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2099 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2100
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2101 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2102 ast_for_print_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2103 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2104 /* print_stmt: 'print' ( [ test (',' test)* [','] ]
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2105 \| '>>' test [ (',' test)+ [','] ] )
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2106 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2107 expr_ty dest = NULL, expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2108 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2109 bool nl;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2110 int i, j, start = 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2111
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2112 REQ(n, print_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2113 if (NCH(n) >= 2 && TYPE(CHILD(n, 1)) == RIGHTSHIFT) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2114 dest = ast_for_expr(c, CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2115 if (!dest)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2116 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2117 start = 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2118 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2119 seq = asdl_seq_new((NCH(n) + 1 - start) / 2, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2120 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2121 return NULL;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2122 for (i = start, j = 0; i < NCH(n); i += 2, ++j) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2123 expression = ast_for_expr(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2124 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2125 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2126 asdl_seq_SET(seq, j, expression);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2127 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2128 nl = (TYPE(CHILD(n, NCH(n) - 1)) == COMMA) ? false : true;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2129 return Print(dest, seq, nl, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2130 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2131
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2132 static asdl_seq *
37604 c732f66c913f Convert 0 to their respective enum types. Convert Martin v. Löwis <martin@v.loewis.de> parents: 37597 diff changeset	2133 ast_for_exprlist(struct compiling c, const node n, expr_context_ty context)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2134 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2135 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2136 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2137 expr_ty e;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2138
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2139 REQ(n, exprlist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2140
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2141 seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2142 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2143 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2144 for (i = 0; i < NCH(n); i += 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2145 e = ast_for_expr(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2146 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2147 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2148 asdl_seq_SET(seq, i / 2, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2149 if (context && !set_context(e, context, CHILD(n, i)))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2150 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2151 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2152 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2153 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2154
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2155 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2156 ast_for_del_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2157 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2158 asdl_seq *expr_list;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2159
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2160 /* del_stmt: 'del' exprlist */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2161 REQ(n, del_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2162
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2163 expr_list = ast_for_exprlist(c, CHILD(n, 1), Del);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2164 if (!expr_list)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2165 return NULL;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2166 return Delete(expr_list, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2167 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2168
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2169 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2170 ast_for_flow_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2171 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2172 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2173 flow_stmt: break_stmt \| continue_stmt \| return_stmt \| raise_stmt
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2174 \| yield_stmt
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2175 break_stmt: 'break'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2176 continue_stmt: 'continue'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2177 return_stmt: 'return' [testlist]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2178 yield_stmt: yield_expr
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2179 yield_expr: 'yield' testlist
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2180 raise_stmt: 'raise' [test [',' test [',' test]]]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2181 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2182 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2183
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2184 REQ(n, flow_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2185 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2186 switch (TYPE(ch)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2187 case break_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2188 return Break(LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2189 case continue_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2190 return Continue(LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2191 case yield_stmt: { /* will reduce to yield_expr */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2192 expr_ty exp = ast_for_expr(c, CHILD(ch, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2193 if (!exp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2194 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2195 return Expr(exp, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2196 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2197 case return_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2198 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2199 return Return(NULL, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2200 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2201 expr_ty expression = ast_for_testlist(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2202 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2203 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2204 return Return(expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2205 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2206 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2207 case raise_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2208 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2209 return Raise(NULL, NULL, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2210 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2211 else if (NCH(ch) == 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2212 expr_ty expression = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2213 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2214 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2215 return Raise(expression, NULL, NULL, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2216 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2217 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2218 else if (NCH(ch) == 4) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2219 expr_ty expr1, expr2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2220
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2221 expr1 = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2222 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2223 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2224 expr2 = ast_for_expr(c, CHILD(ch, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2225 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2226 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2227
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2228 return Raise(expr1, expr2, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2229 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2230 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2231 else if (NCH(ch) == 6) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2232 expr_ty expr1, expr2, expr3;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2233
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2234 expr1 = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2235 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2236 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2237 expr2 = ast_for_expr(c, CHILD(ch, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2238 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2239 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2240 expr3 = ast_for_expr(c, CHILD(ch, 5));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2241 if (!expr3)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2242 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2243
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2244 return Raise(expr1, expr2, expr3, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2245 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2246 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2247 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2248 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2249 "unexpected flow_stmt: %d", TYPE(ch));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2250 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2251 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2252
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2253 PyErr_SetString(PyExc_SystemError, "unhandled flow statement");
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2254 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2255 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2256
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2257 static alias_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2258 alias_for_import_name(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2259 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2260 /*
36742 658f8ff2a442 Make 'as' an actual keyword when with's future statement is used. Not Thomas Wouters <thomas@python.org> parents: 36718 diff changeset	2261 import_as_name: NAME ['as' NAME]
658f8ff2a442 Make 'as' an actual keyword when with's future statement is used. Not Thomas Wouters <thomas@python.org> parents: 36718 diff changeset	2262 dotted_as_name: dotted_name ['as' NAME]
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2263 dotted_name: NAME ('.' NAME)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2264 */
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2265 PyObject *str;
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2266
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2267 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2268 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2269 case import_as_name:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2270 str = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2271 if (NCH(n) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2272 str = NEW_IDENTIFIER(CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2273 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2274 return alias(NEW_IDENTIFIER(CHILD(n, 0)), str, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2275 case dotted_as_name:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2276 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2277 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2278 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2279 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2280 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2281 alias_ty a = alias_for_import_name(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2282 if (!a)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2283 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2284 assert(!a->asname);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2285 a->asname = NEW_IDENTIFIER(CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2286 return a;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2287 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2288 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2289 case dotted_name:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2290 if (NCH(n) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2291 return alias(NEW_IDENTIFIER(CHILD(n, 0)), NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2292 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2293 /* Create a string of the form "a.b.c" */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2294 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2295 size_t len;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2296 char *s;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2297
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2298 len = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2299 for (i = 0; i < NCH(n); i += 2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2300 /* length of string plus one for the dot */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2301 len += strlen(STR(CHILD(n, i))) + 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2302 len--; /* the last name doesn't have a dot */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2303 str = PyString_FromStringAndSize(NULL, len);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2304 if (!str)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2305 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2306 s = PyString_AS_STRING(str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2307 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2308 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2309 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2310 char *sch = STR(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2311 strcpy(s, STR(CHILD(n, i)));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2312 s += strlen(sch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2313 *s++ = '.';
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2314 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2315 --s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2316 *s = '\0';
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2317 PyString_InternInPlace(&str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2318 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2319 return alias(str, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2320 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2321 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2322 case STAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2323 str = PyString_InternFromString("*");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2324 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2325 return alias(str, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2326 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2327 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2328 "unexpected import name: %d", TYPE(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2329 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2330 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2331
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2332 PyErr_SetString(PyExc_SystemError, "unhandled import name condition");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2333 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2334 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2335
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2336 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2337 ast_for_import_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2338 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2339 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2340 import_stmt: import_name \| import_from
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2341 import_name: 'import' dotted_as_names
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2342 import_from: 'from' ('.'* dotted_name \| '.') 'import'
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2343 ('*' \| '(' import_as_names ')' \| import_as_names)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2344 */
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2345 int lineno;
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2346 int col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2347 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2348 asdl_seq *aliases;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2349
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2350 REQ(n, import_stmt);
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2351 lineno = LINENO(n);
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2352 col_offset = n->n_col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2353 n = CHILD(n, 0);
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2354 if (TYPE(n) == import_name) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2355 n = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2356 REQ(n, dotted_as_names);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2357 aliases = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2358 if (!aliases)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2359 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2360 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2361 alias_ty import_alias = alias_for_import_name(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2362 if (!import_alias)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2363 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2364 asdl_seq_SET(aliases, i / 2, import_alias);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2365 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2366 return Import(aliases, lineno, col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2367 }
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2368 else if (TYPE(n) == import_from) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2369 int n_children;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2370 int idx, ndots = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2371 alias_ty mod = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2372 identifier modname;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2373
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2374 /* Count the number of dots (for relative imports) and check for the
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2375 optional module name */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2376 for (idx = 1; idx < NCH(n); idx++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2377 if (TYPE(CHILD(n, idx)) == dotted_name) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2378 mod = alias_for_import_name(c, CHILD(n, idx));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2379 idx++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2380 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2381 } else if (TYPE(CHILD(n, idx)) != DOT) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2382 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2383 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2384 ndots++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2385 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2386 idx++; /* skip over the 'import' keyword */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2387 switch (TYPE(CHILD(n, idx))) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2388 case STAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2389 /* from ... import * */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2390 n = CHILD(n, idx);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2391 n_children = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2392 if (ndots) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2393 ast_error(n, "'import *' not allowed with 'from .'");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2394 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2395 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2396 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2397 case LPAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2398 /* from ... import (x, y, z) */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2399 n = CHILD(n, idx + 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2400 n_children = NCH(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2401 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2402 case import_as_names:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2403 /* from ... import x, y, z */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2404 n = CHILD(n, idx);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2405 n_children = NCH(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2406 if (n_children % 2 == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2407 ast_error(n, "trailing comma not allowed without"
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2408 " surrounding parentheses");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2409 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2410 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2411 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2412 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2413 ast_error(n, "Unexpected node-type in from-import");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2414 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2415 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2416
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2417 aliases = asdl_seq_new((n_children + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2418 if (!aliases)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2419 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2420
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2421 /* handle "from ... import " special b/c there's no children /
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2422 if (TYPE(n) == STAR) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2423 alias_ty import_alias = alias_for_import_name(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2424 if (!import_alias)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2425 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2426 asdl_seq_SET(aliases, 0, import_alias);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2427 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2428 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2429 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2430 alias_ty import_alias = alias_for_import_name(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2431 if (!import_alias)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2432 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2433 asdl_seq_SET(aliases, i / 2, import_alias);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2434 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2435 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2436 if (mod != NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2437 modname = mod->name;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2438 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2439 modname = new_identifier("", c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2440 return ImportFrom(modname, aliases, ndots, lineno, col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2441 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2442 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2443 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2444 "unknown import statement: starts with command '%s'",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2445 STR(CHILD(n, 0)));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2446 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2447 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2448
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2449 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2450 ast_for_global_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2451 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2452 /* global_stmt: 'global' NAME (',' NAME)* */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2453 identifier name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2454 asdl_seq *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2455 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2456
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2457 REQ(n, global_stmt);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2458 s = asdl_seq_new(NCH(n) / 2, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2459 if (!s)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2460 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2461 for (i = 1; i < NCH(n); i += 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2462 name = NEW_IDENTIFIER(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2463 if (!name)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2464 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2465 asdl_seq_SET(s, i / 2, name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2466 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2467 return Global(s, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2468 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2469
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2470 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2471 ast_for_exec_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2472 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2473 expr_ty expr1, globals = NULL, locals = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2474 int n_children = NCH(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2475 if (n_children != 2 && n_children != 4 && n_children != 6) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2476 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2477 "poorly formed 'exec' statement: %d parts to statement",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2478 n_children);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2479 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2480 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2481
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2482 /* exec_stmt: 'exec' expr ['in' test [',' test]] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2483 REQ(n, exec_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2484 expr1 = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2485 if (!expr1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2486 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2487 if (n_children >= 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2488 globals = ast_for_expr(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2489 if (!globals)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2490 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2491 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2492 if (n_children == 6) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2493 locals = ast_for_expr(c, CHILD(n, 5));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2494 if (!locals)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2495 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2496 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2497
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2498 return Exec(expr1, globals, locals, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2499 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2500 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2501
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2502 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2503 ast_for_assert_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2504 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2505 /* assert_stmt: 'assert' test [',' test] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2506 REQ(n, assert_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2507 if (NCH(n) == 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2508 expr_ty expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2509 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2510 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2511 return Assert(expression, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2512 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2513 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2514 else if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2515 expr_ty expr1, expr2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2516
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2517 expr1 = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2518 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2519 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2520 expr2 = ast_for_expr(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2521 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2522 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2523
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2524 return Assert(expr1, expr2, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2525 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2526 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2527 "improper number of parts to 'assert' statement: %d",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2528 NCH(n));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2529 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2530 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2531
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2532 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2533 ast_for_suite(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2534 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2535 /* suite: simple_stmt \| NEWLINE INDENT stmt+ DEDENT */
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2536 asdl_seq *seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2537 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2538 int i, total, num, end, pos = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2539 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2540
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2541 REQ(n, suite);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2542
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2543 total = num_stmts(n);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	2544 seq = asdl_seq_new(total, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2545 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2546 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2547 if (TYPE(CHILD(n, 0)) == simple_stmt) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2548 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2549 /* simple_stmt always ends with a NEWLINE,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2550 and may have a trailing SEMI
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2551 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2552 end = NCH(n) - 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2553 if (TYPE(CHILD(n, end - 1)) == SEMI)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2554 end--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2555 /* loop by 2 to skip semi-colons */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2556 for (i = 0; i < end; i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2557 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2558 s = ast_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2559 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2560 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2561 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2562 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2563 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2564 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2565 for (i = 2; i < (NCH(n) - 1); i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2566 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2567 REQ(ch, stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2568 num = num_stmts(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2569 if (num == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2570 /* small_stmt or compound_stmt with only one child */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2571 s = ast_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2572 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2573 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2574 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2575 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2576 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2577 int j;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2578 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2579 REQ(ch, simple_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2580 for (j = 0; j < NCH(ch); j += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2581 /* statement terminates with a semi-colon ';' */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2582 if (NCH(CHILD(ch, j)) == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2583 assert((j + 1) == NCH(ch));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2584 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2585 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2586 s = ast_for_stmt(c, CHILD(ch, j));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2587 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2588 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2589 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2590 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2591 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2592 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2593 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2594 assert(pos == seq->size);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2595 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2596 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2597
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2598 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2599 ast_for_if_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2600 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2601 /* if_stmt: 'if' test ':' suite ('elif' test ':' suite)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2602 ['else' ':' suite]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2603 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2604 char *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2605
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2606 REQ(n, if_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2607
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2608 if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2609 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2610 asdl_seq *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2611
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2612 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2613 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2614 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2615 suite_seq = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2616 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2617 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2618
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2619 return If(expression, suite_seq, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2620 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2621 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2622
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2623 s = STR(CHILD(n, 4));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2624 /* s[2], the third character in the string, will be
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2625 's' for el_s_e, or
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2626 'i' for el_i_f
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2627 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2628 if (s[2] == 's') {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2629 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2630 asdl_seq seq1, seq2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2631
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2632 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2633 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2634 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2635 seq1 = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2636 if (!seq1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2637 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2638 seq2 = ast_for_suite(c, CHILD(n, 6));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2639 if (!seq2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2640 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2641
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2642 return If(expression, seq1, seq2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2643 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2644 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2645 else if (s[2] == 'i') {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2646 int i, n_elif, has_else = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2647 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2648 asdl_seq *suite_seq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2649 asdl_seq *orelse = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2650 n_elif = NCH(n) - 4;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2651 /* must reference the child n_elif+1 since 'else' token is third,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2652 not fourth, child from the end. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2653 if (TYPE(CHILD(n, (n_elif + 1))) == NAME
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2654 && STR(CHILD(n, (n_elif + 1)))[2] == 's') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2655 has_else = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2656 n_elif -= 3;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2657 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2658 n_elif /= 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2659
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2660 if (has_else) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2661 asdl_seq *suite_seq2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2662
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2663 orelse = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2664 if (!orelse)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2665 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2666 expression = ast_for_expr(c, CHILD(n, NCH(n) - 6));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2667 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2668 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2669 suite_seq = ast_for_suite(c, CHILD(n, NCH(n) - 4));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2670 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2671 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2672 suite_seq2 = ast_for_suite(c, CHILD(n, NCH(n) - 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2673 if (!suite_seq2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2674 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2675
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2676 asdl_seq_SET(orelse, 0,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2677 If(expression, suite_seq, suite_seq2,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2678 LINENO(CHILD(n, NCH(n) - 6)),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2679 CHILD(n, NCH(n) - 6)->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2680 c->c_arena));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2681 /* the just-created orelse handled the last elif */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2682 n_elif--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2683 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2684
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2685 for (i = 0; i < n_elif; i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2686 int off = 5 + (n_elif - i - 1) * 4;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2687 asdl_seq *newobj = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2688 if (!newobj)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2689 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2690 expression = ast_for_expr(c, CHILD(n, off));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2691 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2692 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2693 suite_seq = ast_for_suite(c, CHILD(n, off + 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2694 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2695 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2696
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2697 asdl_seq_SET(newobj, 0,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2698 If(expression, suite_seq, orelse,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2699 LINENO(CHILD(n, off)),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2700 CHILD(n, off)->n_col_offset, c->c_arena));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2701 orelse = newobj;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2702 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2703 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2704 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2705 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2706 suite_seq = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2707 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2708 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2709 return If(expression, suite_seq, orelse,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2710 LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2711 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2712
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2713 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2714 "unexpected token in 'if' statement: %s", s);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2715 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2716 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2717
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2718 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2719 ast_for_while_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2720 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2721 /* while_stmt: 'while' test ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2722 REQ(n, while_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2723
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2724 if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2725 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2726 asdl_seq *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2727
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2728 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2729 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2730 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2731 suite_seq = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2732 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2733 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2734 return While(expression, suite_seq, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2735 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2736 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2737 else if (NCH(n) == 7) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2738 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2739 asdl_seq seq1, seq2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2740
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2741 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2742 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2743 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2744 seq1 = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2745 if (!seq1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2746 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2747 seq2 = ast_for_suite(c, CHILD(n, 6));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2748 if (!seq2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2749 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2750
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2751 return While(expression, seq1, seq2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2752 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2753 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2754
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2755 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2756 "wrong number of tokens for 'while' statement: %d",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2757 NCH(n));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2758 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2759 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2760
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2761 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2762 ast_for_for_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2763 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2764 asdl_seq _target, seq = NULL, *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2765 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2766 expr_ty target;
39067 7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2767 const node *node_target;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2768 /* for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2769 REQ(n, for_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2770
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2771 if (NCH(n) == 9) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2772 seq = ast_for_suite(c, CHILD(n, 8));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2773 if (!seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2774 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2775 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2776
39067 7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2777 node_target = CHILD(n, 1);
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2778 _target = ast_for_exprlist(c, node_target, Store);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2779 if (!_target)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2780 return NULL;
39067 7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2781 /* Check the # of children rather than the length of _target, since
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2782 for x, in ... has 1 element in _target, but still requires a Tuple. */
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2783 if (NCH(node_target) == 1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2784 target = (expr_ty)asdl_seq_GET(_target, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2785 else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2786 target = Tuple(_target, Store, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2787
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2788 expression = ast_for_testlist(c, CHILD(n, 3));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2789 if (!expression)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2790 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2791 suite_seq = ast_for_suite(c, CHILD(n, 5));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2792 if (!suite_seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2793 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2794
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37235 diff changeset	2795 return For(target, expression, suite_seq, seq, LINENO(n), n->n_col_offset,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2796 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2797 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2798
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2799 static excepthandler_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2800 ast_for_except_clause(struct compiling c, const node exc, node *body)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2801 {
41773 f19e631be101 Backport PEP 3110's new 'except' syntax to 2.6. Collin Winter <collinw@gmail.com> parents: 41579 diff changeset	2802 /* except_clause: 'except' [test [(',' \| 'as') test]] */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2803 REQ(exc, except_clause);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2804 REQ(body, suite);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2805
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2806 if (NCH(exc) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2807 asdl_seq *suite_seq = ast_for_suite(c, body);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2808 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2809 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2810
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2811 return excepthandler(NULL, NULL, suite_seq, LINENO(exc),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2812 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2813 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2814 else if (NCH(exc) == 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2815 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2816 asdl_seq *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2817
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2818 expression = ast_for_expr(c, CHILD(exc, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2819 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2820 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2821 suite_seq = ast_for_suite(c, body);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2822 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2823 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2824
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2825 return excepthandler(expression, NULL, suite_seq, LINENO(exc),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2826 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2827 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2828 else if (NCH(exc) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2829 asdl_seq *suite_seq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2830 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2831 expr_ty e = ast_for_expr(c, CHILD(exc, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2832 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2833 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2834 if (!set_context(e, Store, CHILD(exc, 3)))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2835 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2836 expression = ast_for_expr(c, CHILD(exc, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2837 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2838 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2839 suite_seq = ast_for_suite(c, body);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2840 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2841 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2842
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2843 return excepthandler(expression, e, suite_seq, LINENO(exc),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2844 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2845 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2846
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2847 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2848 "wrong number of children for 'except' clause: %d",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2849 NCH(exc));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2850 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2851 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2852
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2853 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2854 ast_for_try_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2855 {
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2856 const int nch = NCH(n);
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2857 int n_except = (nch - 3)/3;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2858 asdl_seq body, orelse = NULL, *finally = NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2859
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2860 REQ(n, try_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2861
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2862 body = ast_for_suite(c, CHILD(n, 2));
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2863 if (body == NULL)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2864 return NULL;
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2865
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2866 if (TYPE(CHILD(n, nch - 3)) == NAME) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2867 if (strcmp(STR(CHILD(n, nch - 3)), "finally") == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2868 if (nch >= 9 && TYPE(CHILD(n, nch - 6)) == NAME) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2869 /* we can assume it's an "else",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2870 because nch >= 9 for try-else-finally and
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2871 it would otherwise have a type of except_clause */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2872 orelse = ast_for_suite(c, CHILD(n, nch - 4));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2873 if (orelse == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2874 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2875 n_except--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2876 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2877
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2878 finally = ast_for_suite(c, CHILD(n, nch - 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2879 if (finally == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2880 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2881 n_except--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2882 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2883 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2884 /* we can assume it's an "else",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2885 otherwise it would have a type of except_clause */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2886 orelse = ast_for_suite(c, CHILD(n, nch - 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2887 if (orelse == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2888 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2889 n_except--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2890 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2891 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2892 else if (TYPE(CHILD(n, nch - 3)) != except_clause) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2893 ast_error(n, "malformed 'try' statement");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2894 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2895 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2896
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2897 if (n_except > 0) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2898 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2899 stmt_ty except_st;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2900 /* process except statements to create a try ... except */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2901 asdl_seq *handlers = asdl_seq_new(n_except, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2902 if (handlers == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2903 return NULL;
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2904
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2905 for (i = 0; i < n_except; i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2906 excepthandler_ty e = ast_for_except_clause(c, CHILD(n, 3 + i * 3),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2907 CHILD(n, 5 + i * 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2908 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2909 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2910 asdl_seq_SET(handlers, i, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2911 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2912
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2913 except_st = TryExcept(body, handlers, orelse, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2914 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2915 if (!finally)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2916 return except_st;
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2917
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2918 /* if a 'finally' is present too, we nest the TryExcept within a
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2919 TryFinally to emulate try ... except ... finally */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2920 body = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2921 if (body == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2922 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2923 asdl_seq_SET(body, 0, except_st);
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2924 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2925
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2926 /* must be a try ... finally (except clauses are in body, if any exist) */
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2927 assert(finally != NULL);
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2928 return TryFinally(body, finally, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2929 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2930
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2931 static expr_ty
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2932 ast_for_with_var(struct compiling c, const node n)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2933 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2934 REQ(n, with_var);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2935 return ast_for_expr(c, CHILD(n, 1));
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2936 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2937
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2938 /* with_stmt: 'with' test [ with_var ] ':' suite */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2939 static stmt_ty
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2940 ast_for_with_stmt(struct compiling c, const node n)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2941 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2942 expr_ty context_expr, optional_vars = NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2943 int suite_index = 3; /* skip 'with', test, and ':' */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2944 asdl_seq *suite_seq;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2945
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2946 assert(TYPE(n) == with_stmt);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2947 context_expr = ast_for_expr(c, CHILD(n, 1));
41205 b43a52f71696 Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements. Collin Winter <collinw@gmail.com> parents: 40972 diff changeset	2948 if (!context_expr)
b43a52f71696 Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements. Collin Winter <collinw@gmail.com> parents: 40972 diff changeset	2949 return NULL;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2950 if (TYPE(CHILD(n, 2)) == with_var) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2951 optional_vars = ast_for_with_var(c, CHILD(n, 2));
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2952
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2953 if (!optional_vars) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2954 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2955 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2956 if (!set_context(optional_vars, Store, n)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2957 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2958 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2959 suite_index = 4;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2960 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2961
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2962 suite_seq = ast_for_suite(c, CHILD(n, suite_index));
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2963 if (!suite_seq) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2964 return NULL;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2965 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2966 return With(context_expr, optional_vars, suite_seq, LINENO(n),
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2967 n->n_col_offset, c->c_arena);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2968 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2969
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2970 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2971 ast_for_classdef(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2972 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2973 /* classdef: 'class' NAME ['(' testlist ')'] ':' suite */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2974 asdl_seq bases, s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2975
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2976 REQ(n, classdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2977
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2978 if (!strcmp(STR(CHILD(n, 1)), "None")) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2979 ast_error(n, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2980 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2981 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2982
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2983 if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2984 s = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2985 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2986 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2987 return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), NULL, s, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2988 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2989 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2990 /* check for empty base list */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2991 if (TYPE(CHILD(n,3)) == RPAR) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2992 s = ast_for_suite(c, CHILD(n,5));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2993 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2994 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2995 return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), NULL, s, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2996 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2997 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2998
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2999 /* else handle the base class list */
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	3000 bases = ast_for_class_bases(c, CHILD(n, 3));
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	3001 if (!bases)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3002 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3003
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3004 s = ast_for_suite(c, CHILD(n, 6));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	3005 if (!s)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3006 return NULL;
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37235 diff changeset	3007 return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), bases, s, LINENO(n),
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3008 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3009 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3010
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3011 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3012 ast_for_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3013 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3014 if (TYPE(n) == stmt) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3015 assert(NCH(n) == 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3016 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3017 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3018 if (TYPE(n) == simple_stmt) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3019 assert(num_stmts(n) == 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3020 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3021 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3022 if (TYPE(n) == small_stmt) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3023 REQ(n, small_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3024 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3025 /* small_stmt: expr_stmt \| print_stmt \| del_stmt \| pass_stmt
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3026 \| flow_stmt \| import_stmt \| global_stmt \| exec_stmt
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3027 \| assert_stmt
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3028 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3029 switch (TYPE(n)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3030 case expr_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3031 return ast_for_expr_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3032 case print_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3033 return ast_for_print_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3034 case del_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3035 return ast_for_del_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3036 case pass_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3037 return Pass(LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3038 case flow_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3039 return ast_for_flow_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3040 case import_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3041 return ast_for_import_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3042 case global_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3043 return ast_for_global_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3044 case exec_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3045 return ast_for_exec_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3046 case assert_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3047 return ast_for_assert_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3048 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3049 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3050 "unhandled small_stmt: TYPE=%d NCH=%d\n",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3051 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3052 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3053 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3054 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3055 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3056 /* compound_stmt: if_stmt \| while_stmt \| for_stmt \| try_stmt
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3057 \| funcdef \| classdef
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3058 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3059 node *ch = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3060 REQ(n, compound_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3061 switch (TYPE(ch)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3062 case if_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3063 return ast_for_if_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3064 case while_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3065 return ast_for_while_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3066 case for_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3067 return ast_for_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3068 case try_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3069 return ast_for_try_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3070 case with_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3071 return ast_for_with_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3072 case funcdef:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3073 return ast_for_funcdef(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3074 case classdef:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3075 return ast_for_classdef(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3076 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3077 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3078 "unhandled small_stmt: TYPE=%d NCH=%d\n",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3079 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3080 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3081 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3082 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3083 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3084
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3085 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3086 parsenumber(const char *s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3087 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3088 const char *end;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3089 long x;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3090 double dx;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3091 #ifndef WITHOUT_COMPLEX
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3092 Py_complex c;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3093 int imflag;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3094 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3095
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3096 errno = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3097 end = s + strlen(s) - 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3098 #ifndef WITHOUT_COMPLEX
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3099 imflag = end == 'j' \|\| end == 'J';
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3100 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3101 if (end == 'l' \|\| end == 'L')
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3102 return PyLong_FromString((char )s, (char *)0, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3103 if (s[0] == '0') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3104 x = (long) PyOS_strtoul((char )s, (char *)&end, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3105 if (x < 0 && errno == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3106 return PyLong_FromString((char *)s,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3107 (char **)0,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3108 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3109 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3110 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3111 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3112 x = PyOS_strtol((char )s, (char *)&end, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3113 if (*end == '\0') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3114 if (errno != 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3115 return PyLong_FromString((char )s, (char *)0, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3116 return PyInt_FromLong(x);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3117 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3118 /* XXX Huge floats may silently fail */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3119 #ifndef WITHOUT_COMPLEX
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3120 if (imflag) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3121 c.real = 0.;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3122 PyFPE_START_PROTECT("atof", return 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3123 c.imag = PyOS_ascii_atof(s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3124 PyFPE_END_PROTECT(c)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3125 return PyComplex_FromCComplex(c);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3126 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3127 else
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3128 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3129 {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3130 PyFPE_START_PROTECT("atof", return 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3131 dx = PyOS_ascii_atof(s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3132 PyFPE_END_PROTECT(dx)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3133 return PyFloat_FromDouble(dx);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3134 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3135 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3136
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3137 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3138 decode_utf8(const char *sPtr, const char end, char* encoding)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3139 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3140 #ifndef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3141 Py_FatalError("decode_utf8 should not be called in this build.");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3142 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3143 #else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3144 PyObject u, v;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3145 char s, t;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3146 t = s = (char )sPtr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3147 /* while (s < end && s != '\\') s++; / /* inefficient for u".." */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3148 while (s < end && (*s & 0x80)) s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3149 *sPtr = s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3150 u = PyUnicode_DecodeUTF8(t, s - t, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3151 if (u == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3152 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3153 v = PyUnicode_AsEncodedString(u, encoding, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3154 Py_DECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3155 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3156 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3157 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3158
42459 dbfc3cf1522d Place #ifdef Py_USING_UNICODE around decode_unicode(). Georg Brandl <georg@python.org> parents: 42308 diff changeset	3159 #ifdef Py_USING_UNICODE
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3160 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3161 decode_unicode(const char s, size_t len, int rawmode, const char encoding)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3162 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3163 PyObject v, u;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3164 char *buf;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3165 char *p;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3166 const char *end;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3167 if (encoding == NULL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3168 buf = (char *)s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3169 u = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3170 } else if (strcmp(encoding, "iso-8859-1") == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3171 buf = (char *)s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3172 u = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3173 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3174 /* "\XX" may become "\u005c\uHHLL" (12 bytes) */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3175 u = PyString_FromStringAndSize((char )NULL, len 4);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3176 if (u == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3177 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3178 p = buf = PyString_AsString(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3179 end = s + len;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3180 while (s < end) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3181 if (*s == '\\') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3182 p++ = s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3183 if (*s & 0x80) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3184 strcpy(p, "u005c");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3185 p += 5;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3186 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3187 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3188 if (s & 0x80) { / XXX inefficient */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3189 PyObject *w;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3190 char *r;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3191 Py_ssize_t rn, i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3192 w = decode_utf8(&s, end, "utf-16-be");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3193 if (w == NULL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3194 Py_DECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3195 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3196 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3197 r = PyString_AsString(w);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3198 rn = PyString_Size(w);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3199 assert(rn % 2 == 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3200 for (i = 0; i < rn; i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3201 sprintf(p, "\\u%02x%02x",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3202 r[i + 0] & 0xFF,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3203 r[i + 1] & 0xFF);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3204 p += 6;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3205 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3206 Py_DECREF(w);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3207 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3208 p++ = s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3209 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3210 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3211 len = p - buf;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3212 s = buf;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3213 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3214 if (rawmode)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3215 v = PyUnicode_DecodeRawUnicodeEscape(s, len, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3216 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3217 v = PyUnicode_DecodeUnicodeEscape(s, len, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3218 Py_XDECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3219 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3220 }
42459 dbfc3cf1522d Place #ifdef Py_USING_UNICODE around decode_unicode(). Georg Brandl <georg@python.org> parents: 42308 diff changeset	3221 #endif
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3222
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3223 /* s is a Python string literal, including the bracketing quote characters,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3224 * and r &/or u prefixes (if any), and embedded escape sequences (if any).
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3225 * parsestr parses it, and returns the decoded Python string object.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3226 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3227 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3228 parsestr(const char s, const char encoding)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3229 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3230 size_t len;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3231 int quote = Py_CHARMASK(*s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3232 int rawmode = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3233 int need_encoding;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3234 int unicode = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3235
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3236 if (isalpha(quote) \|\| quote == '_') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3237 if (quote == 'u' \|\| quote == 'U') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3238 quote = *++s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3239 unicode = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3240 }
44747 8da9ebf73026 Added bytes and b'' as aliases for str and '' Christian Heimes <christian@cheimes.de> parents: 44572 diff changeset	3241 if (quote == 'b' \|\| quote == 'B') {
8da9ebf73026 Added bytes and b'' as aliases for str and '' Christian Heimes <christian@cheimes.de> parents: 44572 diff changeset	3242 quote = *++s;
8da9ebf73026 Added bytes and b'' as aliases for str and '' Christian Heimes <christian@cheimes.de> parents: 44572 diff changeset	3243 }
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3244 if (quote == 'r' \|\| quote == 'R') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3245 quote = *++s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3246 rawmode = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3247 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3248 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3249 if (quote != '\'' && quote != '\"') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3250 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3251 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3252 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3253 s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3254 len = strlen(s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3255 if (len > INT_MAX) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3256 PyErr_SetString(PyExc_OverflowError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3257 "string to parse is too long");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3258 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3259 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3260 if (s[--len] != quote) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3261 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3262 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3263 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3264 if (len >= 4 && s[0] == quote && s[1] == quote) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3265 s += 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3266 len -= 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3267 if (s[--len] != quote \|\| s[--len] != quote) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3268 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3269 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3270 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3271 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3272 #ifdef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3273 if (unicode \|\| Py_UnicodeFlag) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3274 return decode_unicode(s, len, rawmode, encoding);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3275 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3276 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3277 need_encoding = (encoding != NULL &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3278 strcmp(encoding, "utf-8") != 0 &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3279 strcmp(encoding, "iso-8859-1") != 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3280 if (rawmode \|\| strchr(s, '\\') == NULL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3281 if (need_encoding) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3282 #ifndef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3283 /* This should not happen - we never see any other
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3284 encoding. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3285 Py_FatalError(
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3286 "cannot deal with encodings in this build.");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3287 #else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3288 PyObject v, u = PyUnicode_DecodeUTF8(s, len, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3289 if (u == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3290 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3291 v = PyUnicode_AsEncodedString(u, encoding, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3292 Py_DECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3293 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3294 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3295 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3296 return PyString_FromStringAndSize(s, len);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3297 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3298 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3299
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3300 return PyString_DecodeEscape(s, len, NULL, unicode,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3301 need_encoding ? encoding : NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3302 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3303
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3304 /* Build a Python string object out of a STRING atom. This takes care of
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3305 * compile-time literal catenation, calling parsestr() on each piece, and
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3306 * pasting the intermediate results together.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3307 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3308 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3309 parsestrplus(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3310 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3311 PyObject *v;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3312 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3313 REQ(CHILD(n, 0), STRING);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3314 if ((v = parsestr(STR(CHILD(n, 0)), c->c_encoding)) != NULL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3315 /* String literal concatenation */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3316 for (i = 1; i < NCH(n); i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3317 PyObject *s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3318 s = parsestr(STR(CHILD(n, i)), c->c_encoding);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3319 if (s == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3320 goto onError;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3321 if (PyString_Check(v) && PyString_Check(s)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3322 PyString_ConcatAndDel(&v, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3323 if (v == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3324 goto onError;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3325 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3326 #ifdef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3327 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3328 PyObject *temp = PyUnicode_Concat(v, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3329 Py_DECREF(s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3330 Py_DECREF(v);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3331 v = temp;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3332 if (v == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3333 goto onError;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3334 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3335 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3336 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3337 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3338 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3339
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3340 onError:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3341 Py_XDECREF(v);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3342 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3343 }

Mercurial > cpython-lru_cache-weakref

annotate Python/ast.c @ 45403:0ea236a71d77 legacy-trunk