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

annotate Python/ast.c @ 40529:54cd47788811

PEP 3107 - Function Annotations thanks to Tony Lownds

author	Neal Norwitz <nnorwitz@gmail.com>
date	Thu, 28 Dec 2006 06:47:50 +0000
parents	cc992d75d5b3
children	4bab65fcca8e

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 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	22 };
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 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	25 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	26 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	27 static asdl_seq ast_for_suite(struct compiling , const node *);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	28 static asdl_seq ast_for_exprlist(struct compiling , const node *, 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	29 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	30 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	31
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	32 /* Note different signature for ast_for_call */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	33 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	34
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	35 static PyObject parsenumber(const char );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	36 static PyObject parsestr(const char s, const char *encoding);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	37 static PyObject parsestrplus(struct compiling , const node *n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	38
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	39 #ifndef LINENO
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	40 #define LINENO(n) ((n)->n_lineno)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	41 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	42
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	43 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	44 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	45 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	46 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	47 return id;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	48 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	49
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	50 #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	51
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	52 /* 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	53 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	54 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	55 the filename to everything function.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	56
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	57 XXX Maybe we should just pass the filename...
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	60 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	61 ast_error(const node n, const char errstr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	62 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	63 PyObject *u = Py_BuildValue("zi", errstr, LINENO(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	64 if (!u)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	65 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	66 PyErr_SetObject(PyExc_SyntaxError, u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	67 Py_DECREF(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	68 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	69 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	70
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	71 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	72 ast_error_finish(const char *filename)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	73 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	74 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	75 long lineno;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	76
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	77 assert(PyErr_Occurred());
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	78 if (!PyErr_ExceptionMatches(PyExc_SyntaxError))
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	79 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	80
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	81 PyErr_Fetch(&type, &value, &tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	82 errstr = PyTuple_GetItem(value, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	83 if (!errstr)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	84 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	85 Py_INCREF(errstr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	86 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	87 if (lineno == -1) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	88 Py_DECREF(errstr);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	89 return;
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	90 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	91 Py_DECREF(value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	92
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	93 loc = PyErr_ProgramText(filename, lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	94 if (!loc) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	95 Py_INCREF(Py_None);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	96 loc = Py_None;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	97 }
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36224 diff changeset	98 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	99 Py_DECREF(loc);
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	100 if (!tmp) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	101 Py_DECREF(errstr);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	102 return;
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	103 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	104 value = PyTuple_Pack(2, errstr, tmp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	105 Py_DECREF(errstr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	106 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	107 if (!value)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	108 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	109 PyErr_Restore(type, value, tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	110 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	111
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	112 /* num_stmts() returns number of contained statements.
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 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	115 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	116 grammar:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	117
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	118 stmt: simple_stmt \| compound_stmt
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	119 simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	120
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	121 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	122 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	123 small_stmt elements is returned.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	124 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	125
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	126 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	127 num_stmts(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	128 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	129 int i, l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	130 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	131
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	132 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	133 case single_input:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	134 if (TYPE(CHILD(n, 0)) == NEWLINE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	135 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	136 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	137 return num_stmts(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	138 case file_input:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	139 l = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	140 for (i = 0; i < NCH(n); i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	141 ch = CHILD(n, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	142 if (TYPE(ch) == stmt)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	143 l += num_stmts(ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	144 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	145 return l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	146 case stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	147 return num_stmts(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	148 case compound_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	149 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	150 case simple_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	151 return NCH(n) / 2; /* Divide by 2 to remove count of semi-colons */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	152 case suite:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	153 if (NCH(n) == 1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	154 return num_stmts(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	155 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	156 l = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	157 for (i = 2; i < (NCH(n) - 1); i++)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	158 l += num_stmts(CHILD(n, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	159 return l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	160 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	161 default: {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	162 char buf[128];
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	163
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	164 sprintf(buf, "Non-statement found: %d %d\n",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	165 TYPE(n), NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	166 Py_FatalError(buf);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	167 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	168 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	169 assert(0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	170 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	171 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	172
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	173 /* 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	174 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	175
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	176 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	177 PyAST_FromNode(const node n, PyCompilerFlags flags, const char *filename,
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	178 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	179 {
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	180 int i, j, k, num;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	181 asdl_seq *stmts = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	182 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	183 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	184 struct compiling c;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	185
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	186 if (flags && flags->cf_flags & PyCF_SOURCE_IS_UTF8) {
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	187 c.c_encoding = "utf-8";
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	188 if (TYPE(n) == encoding_decl) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	189 ast_error(n, "encoding declaration in Unicode string");
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	190 goto error;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	191 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	192 } else if (TYPE(n) == encoding_decl) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	193 c.c_encoding = STR(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	194 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	195 } else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	196 c.c_encoding = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	197 }
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	198 c.c_arena = arena;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	199
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	200 k = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	201 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	202 case file_input:
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	203 stmts = asdl_seq_new(num_stmts(n), arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	204 if (!stmts)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	205 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	206 for (i = 0; i < NCH(n) - 1; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	207 ch = CHILD(n, i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	208 if (TYPE(ch) == NEWLINE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	209 continue;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	210 REQ(ch, stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	211 num = num_stmts(ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	212 if (num == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	213 s = ast_for_stmt(&c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	214 if (!s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	215 goto error;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	216 asdl_seq_SET(stmts, k++, s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	217 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	218 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	219 ch = CHILD(ch, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	220 REQ(ch, simple_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	221 for (j = 0; j < num; j++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	222 s = ast_for_stmt(&c, CHILD(ch, j * 2));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	223 if (!s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	224 goto error;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	225 asdl_seq_SET(stmts, k++, s);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	226 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	227 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	228 }
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	229 return Module(stmts, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	230 case eval_input: {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	231 expr_ty testlist_ast;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	232
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	233 /* XXX Why not gen_for here? */
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	234 testlist_ast = ast_for_testlist(&c, CHILD(n, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	235 if (!testlist_ast)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	236 goto error;
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	237 return Expression(testlist_ast, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	238 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	239 case single_input:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	240 if (TYPE(CHILD(n, 0)) == NEWLINE) {
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	241 stmts = asdl_seq_new(1, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	242 if (!stmts)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	243 goto error;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	244 asdl_seq_SET(stmts, 0, Pass(n->n_lineno, n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	245 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	246 return Interactive(stmts, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	247 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	248 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	249 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	250 num = 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	251 stmts = asdl_seq_new(num, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	252 if (!stmts)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	253 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	254 if (num == 1) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	255 s = ast_for_stmt(&c, n);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	256 if (!s)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	257 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	258 asdl_seq_SET(stmts, 0, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	259 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	260 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	261 /* Only a simple_stmt can contain multiple statements. */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	262 REQ(n, simple_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	263 for (i = 0; i < NCH(n); i += 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	264 if (TYPE(CHILD(n, i)) == NEWLINE)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	265 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	266 s = ast_for_stmt(&c, CHILD(n, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	267 if (!s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	268 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	269 asdl_seq_SET(stmts, i / 2, s);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	270 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	271 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	272
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	273 return Interactive(stmts, arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	274 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	275 default:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	276 goto error;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	277 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	278 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	279 ast_error_finish(filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	280 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	281 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	282
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	283 /* 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	284 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	285
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	286 static operator_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	287 get_operator(const node *n)
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 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	290 case VBAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	291 return BitOr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	292 case CIRCUMFLEX:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	293 return BitXor;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	294 case AMPER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	295 return BitAnd;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	296 case LEFTSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	297 return LShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	298 case RIGHTSHIFT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	299 return RShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	300 case PLUS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	301 return Add;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	302 case MINUS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	303 return Sub;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	304 case STAR:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	305 return Mult;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	306 case SLASH:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	307 return Div;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	308 case DOUBLESLASH:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	309 return FloorDiv;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	310 case PERCENT:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	311 return Mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	312 default:
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	313 return (operator_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	314 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	315 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	316
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	317 /* 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	318
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	319 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	320 (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	321 an appropriate syntax error and returns false.
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	324 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	325 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	326 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	327 asdl_seq *s = NULL;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	328 /* 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	329 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	330 */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	331 const char* expr_name = NULL;
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	332
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	333 /* 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	334 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	335 a little more complex than necessary as a result. It also means
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	336 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	337 Consider restructuring so that augmented assignment uses
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	338 set_context(), too.
36418 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 assert(ctx != AugStore && ctx != AugLoad);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	341
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	342 switch (e->kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	343 case Attribute_kind:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	344 if (ctx == Store &&
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	345 !strcmp(PyString_AS_STRING(e->v.Attribute.attr), "None")) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	346 return ast_error(n, "assignment to None");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	347 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	348 e->v.Attribute.ctx = ctx;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	349 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	350 case Subscript_kind:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	351 e->v.Subscript.ctx = ctx;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	352 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	353 case Name_kind:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	354 if (ctx == Store &&
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	355 !strcmp(PyString_AS_STRING(e->v.Name.id), "None")) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	356 return ast_error(n, "assignment to None");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	357 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	358 e->v.Name.ctx = ctx;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	359 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	360 case List_kind:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	361 e->v.List.ctx = ctx;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	362 s = e->v.List.elts;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	363 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	364 case Tuple_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	365 if (asdl_seq_LEN(e->v.Tuple.elts) == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	366 return ast_error(n, "can't assign to ()");
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	367 e->v.Tuple.ctx = ctx;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	368 s = e->v.Tuple.elts;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	369 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	370 case Lambda_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	371 expr_name = "lambda";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	372 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	373 case Call_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	374 expr_name = "function call";
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	375 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	376 case BoolOp_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	377 case BinOp_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	378 case UnaryOp_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	379 expr_name = "operator";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	380 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	381 case GeneratorExp_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	382 expr_name = "generator expression";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	383 break;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	384 case Yield_kind:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	385 expr_name = "yield expression";
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	386 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	387 case ListComp_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	388 expr_name = "list comprehension";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	389 break;
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	390 case Dict_kind:
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	391 case Set_kind:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	392 case Num_kind:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	393 case Str_kind:
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	394 expr_name = "literal";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	395 break;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	396 case Ellipsis_kind:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	397 expr_name = "Ellipsis";
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	398 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	399 case Compare_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	400 expr_name = "comparison";
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	401 break;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	402 case IfExp_kind:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	403 expr_name = "conditional expression";
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	404 break;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	405 default:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	406 PyErr_Format(PyExc_SystemError,
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	407 "unexpected expression in assignment %d (line %d)",
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	408 e->kind, e->lineno);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	409 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	410 }
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	411 /* Check for error string set by switch */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	412 if (expr_name) {
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	413 char buf[300];
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	414 PyOS_snprintf(buf, sizeof(buf),
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	415 "can't %s %s",
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	416 ctx == Store ? "assign to" : "delete",
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	417 expr_name);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	418 return ast_error(n, buf);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	419 }
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	420
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	421 /* If the LHS is a list or tuple, we need to set the assignment
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	422 context for all the contained elements.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	423 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	424 if (s) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	425 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	426
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	427 for (i = 0; i < asdl_seq_LEN(s); i++) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	428 if (!set_context((expr_ty)asdl_seq_GET(s, i), ctx, n))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	429 return 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	430 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	431 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	432 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	433 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	434
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	435 static operator_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	436 ast_for_augassign(const node *n)
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 REQ(n, augassign);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	439 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	440 switch (STR(n)[0]) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	441 case '+':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	442 return Add;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	443 case '-':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	444 return Sub;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	445 case '/':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	446 if (STR(n)[1] == '/')
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	447 return FloorDiv;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	448 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	449 return Div;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	450 case '%':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	451 return Mod;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	452 case '<':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	453 return LShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	454 case '>':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	455 return RShift;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	456 case '&':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	457 return BitAnd;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	458 case '^':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	459 return BitXor;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	460 case '\|':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	461 return BitOr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	462 case '*':
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	463 if (STR(n)[1] == '*')
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	464 return Pow;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	465 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	466 return Mult;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	467 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	468 PyErr_Format(PyExc_SystemError, "invalid augassign: %s", STR(n));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	469 return (operator_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	470 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	471 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	472
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	473 static cmpop_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	474 ast_for_comp_op(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	475 {
39648 efe3f2c0da5e Killed the <> operator. You must now use !=. Guido van Rossum <guido@python.org> parents: 39610 diff changeset	476 /* comp_op: '<'\|'>'\|'=='\|'>='\|'<='\|'!='\|'in'\|'not' 'in'\|'is'
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	477 \|'is' 'not'
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 REQ(n, comp_op);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	480 if (NCH(n) == 1) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	481 n = CHILD(n, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	482 switch (TYPE(n)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	483 case LESS:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	484 return Lt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	485 case GREATER:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	486 return Gt;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	487 case EQEQUAL: /* == */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	488 return Eq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	489 case LESSEQUAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	490 return LtE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	491 case GREATEREQUAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	492 return GtE;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	493 case NOTEQUAL:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	494 return NotEq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	495 case NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	496 if (strcmp(STR(n), "in") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	497 return In;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	498 if (strcmp(STR(n), "is") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	499 return Is;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	500 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	501 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s",
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	502 STR(n));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	503 return (cmpop_ty)0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	504 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	505 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	506 else if (NCH(n) == 2) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	507 /* handle "not in" and "is not" */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	508 switch (TYPE(CHILD(n, 0))) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	509 case NAME:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	510 if (strcmp(STR(CHILD(n, 1)), "in") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	511 return NotIn;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	512 if (strcmp(STR(CHILD(n, 0)), "is") == 0)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	513 return IsNot;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	514 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	515 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s %s",
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	516 STR(CHILD(n, 0)), STR(CHILD(n, 1)));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	517 return (cmpop_ty)0;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	518 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	519 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	520 PyErr_Format(PyExc_SystemError, "invalid comp_op: has %d children",
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	521 NCH(n));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	522 return (cmpop_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	523 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	524
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	525 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	526 seq_for_testlist(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	527 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	528 /* testlist: test (',' test)* [','] */
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	529 asdl_seq *seq;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	530 expr_ty expression;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	531 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	532 assert(TYPE(n) == testlist
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	533 \|\| TYPE(n) == listmaker
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	534 \|\| TYPE(n) == testlist_gexp
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	535 \|\| TYPE(n) == testlist_safe
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	536 \|\| TYPE(n) == testlist1
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	537 );
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	538
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	539 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	540 if (!seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	541 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	542
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	543 for (i = 0; i < NCH(n); i += 2) {
36670 296cda9b3e2f Fix assertion errors in debug build, brought on by PEP 308 patch. Thomas Wouters <thomas@python.org> parents: 36666 diff changeset	544 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	545
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	546 expression = ast_for_expr(c, CHILD(n, i));
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	547 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	548 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	549
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	550 assert(i / 2 < seq->size);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	551 asdl_seq_SET(seq, i / 2, expression);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	552 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	553 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	554 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	555
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	556 static arg_ty
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	557 compiler_simple_arg(struct compiling c, const node n)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	558 {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	559 identifier name;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	560 expr_ty annotation = NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	561 node *ch;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	562
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	563 assert(TYPE(n) == tname \|\| TYPE(n) == vname);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	564 ch = CHILD(n, 0);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	565 if (!strcmp(STR(ch), "None")) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	566 ast_error(ch, "assignment to None");
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	567 return NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	568 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	569 name = NEW_IDENTIFIER(ch);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	570 if (!name)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	571 return NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	572
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	573 if (NCH(n) == 3 && TYPE(CHILD(n, 1)) == COLON) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	574 annotation = ast_for_expr(c, CHILD(n, 2));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	575 if (!annotation)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	576 return NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	577 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	578
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	579 return SimpleArg(name, annotation, c->c_arena);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	580 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	581
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	582 static arg_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	583 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	584 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	585 int i, len = (NCH(n) + 1) / 2;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	586 arg_ty arg;
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	587 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	588 if (!args)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	589 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	590
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	591 assert(TYPE(n) == tfplist \|\| TYPE(n) == vfplist);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	592 for (i = 0; i < len; i++) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	593 const node child = CHILD(n, 2i);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	594 /* def foo(((x), y)): -- x is not nested complex, special case. */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	595 while (NCH(child) == 3 && NCH(CHILD(child, 1)) == 1)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	596 child = CHILD(CHILD(child, 1), 0);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	597
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	598 /* child either holds a tname or '(', a tfplist, ')' */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	599 switch (TYPE(CHILD(child, 0))) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	600 case tname:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	601 case vname:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	602 arg = compiler_simple_arg(c, CHILD(child, 0));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	603 break;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	604 case LPAR:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	605 arg = compiler_complex_args(c, CHILD(child, 1));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	606 break;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	607 default:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	608 PyErr_Format(PyExc_SystemError,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	609 "unexpected node in args: %d @ %d",
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	610 TYPE(CHILD(child, 0)), i);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	611 arg = NULL;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	612 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	613 if (!arg)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	614 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	615 asdl_seq_SET(args, i, arg);
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
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	618 return NestedArgs(args, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	619 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	620
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	621 /* returns -1 if failed to handle keyword only arguments
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	622 returns new position to keep processing if successful
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	623 (',' tname ['=' test])*
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	624 ^^^
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	625 start pointing here
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	626 */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	627 static int
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	628 handle_keywordonly_args(struct compiling c, const node n, int start,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	629 asdl_seq kwonlyargs, asdl_seq kwdefaults)
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	630 {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	631 node *ch;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	632 expr_ty expression, annotation;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	633 arg_ty arg;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	634 int i = start;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	635 int j = 0; /* index for kwdefaults and kwonlyargs */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	636 assert(kwonlyargs != NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	637 assert(kwdefaults != NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	638 while (i < NCH(n)) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	639 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	640 switch (TYPE(ch)) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	641 case vname:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	642 case tname:
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	643 if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	644 expression = ast_for_expr(c, CHILD(n, i + 2));
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	645 if (!expression) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	646 ast_error(ch, "assignment to None");
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	647 goto error;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	648 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	649 asdl_seq_SET(kwdefaults, j, expression);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	650 i += 2; /* '=' and test */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	651 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	652 else { /* setting NULL if no default value exists */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	653 asdl_seq_SET(kwdefaults, j, NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	654 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	655 if (NCH(ch) == 3) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	656 /* ch is NAME ':' test */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	657 annotation = ast_for_expr(c, CHILD(ch, 2));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	658 if (!annotation) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	659 ast_error(ch, "expected expression");
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	660 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	661 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	662 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	663 else {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	664 annotation = NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	665 }
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	666 ch = CHILD(ch, 0);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	667 if (!strcmp(STR(ch), "None")) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	668 ast_error(ch, "assignment to None");
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	669 goto error;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	670 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	671 arg = SimpleArg(NEW_IDENTIFIER(ch), annotation, c->c_arena);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	672 if (!arg) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	673 ast_error(ch, "expecting name");
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	674 goto error;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	675 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	676 asdl_seq_SET(kwonlyargs, j++, arg);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	677 i += 2; /* the name and the comma */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	678 break;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	679 case DOUBLESTAR:
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	680 return i;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	681 default:
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	682 ast_error(ch, "unexpected node");
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	683 goto error;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	684 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	685 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	686 return i;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	687 error:
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	688 return -1;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	689 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	690
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	691 /* Create AST for argument list. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	692
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	693 static arguments_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	694 ast_for_arguments(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	695 {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	696 /* This function handles both typedargslist (function definition)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	697 and varargslist (lambda definition).
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	698
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	699 parameters: '(' [typedargslist] ')'
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	700 typedargslist: ((tfpdef ['=' test] ',')*
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	701 ('' [tname] (',' tname ['=' test]) [',' '**' tname]
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	702 \| '**' tname)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	703 \| tfpdef ['=' test] (',' tfpdef ['=' test])* [','])
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	704 varargslist: ((vfpdef ['=' test] ',')*
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	705 ('' [vname] (',' vname ['=' test]) [',' '**' vname]
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	706 \| '**' vname)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	707 \| vfpdef ['=' test] (',' vfpdef ['=' test])* [','])
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	708 */
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	709 int i, j, k, nposargs = 0, nkwonlyargs = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	710 int nposdefaults = 0, found_default = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	711 asdl_seq posargs, posdefaults, kwonlyargs, kwdefaults;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	712 identifier vararg = NULL, kwarg = NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	713 arg_ty arg;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	714 expr_ty varargannotation = NULL, kwargannotation = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	715 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	716
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	717 if (TYPE(n) == parameters) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	718 if (NCH(n) == 2) /* () as argument list */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	719 return arguments(NULL, NULL, NULL, NULL, NULL, NULL, NULL,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	720 NULL, c->c_arena);
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	721 n = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	722 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	723 assert(TYPE(n) == typedargslist \|\| TYPE(n) == varargslist);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	724
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	725 /* first count the number of positional args & defaults */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	726 for (i = 0; i < NCH(n); i++) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	727 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	728 if (TYPE(ch) == STAR) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	729 if (TYPE(CHILD(n, i+1)) == tname
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	730 \|\| TYPE(CHILD(n, i+1)) == vname) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	731 /* skip NAME of vararg */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	732 /* so that following can count only keyword only args */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	733 i += 2;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	734 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	735 else {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	736 i++;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	737 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	738 break;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	739 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	740 if (TYPE(ch) == vfpdef \|\| TYPE(ch) == tfpdef) nposargs++;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	741 if (TYPE(ch) == EQUAL) nposdefaults++;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	742 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	743 /* count the number of keyword only args &
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	744 defaults for keyword only args */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	745 for ( ; i < NCH(n); ++i) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	746 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	747 if (TYPE(ch) == DOUBLESTAR) break;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	748 if (TYPE(ch) == tname \|\| TYPE(ch) == vname) nkwonlyargs++;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	749 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	750
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	751 posargs = (nposargs ? asdl_seq_new(nposargs, c->c_arena) : NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	752 if (!posargs && nposargs)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	753 goto error;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	754 kwonlyargs = (nkwonlyargs ?
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	755 asdl_seq_new(nkwonlyargs, c->c_arena) : NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	756 if (!kwonlyargs && nkwonlyargs)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	757 goto error;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	758 posdefaults = (nposdefaults ?
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	759 asdl_seq_new(nposdefaults, c->c_arena) : NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	760 if (!posdefaults && nposdefaults)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	761 goto error;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	762 /* The length of kwonlyargs and kwdefaults are same
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	763 since we set NULL as default for keyword only argument w/o default
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	764 - we have sequence data structure, but no dictionary */
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	765 kwdefaults = (nkwonlyargs ?
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	766 asdl_seq_new(nkwonlyargs, c->c_arena) : NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	767 if (!kwdefaults && nkwonlyargs)
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	768 goto error;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	769
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	770 if (nposargs + nkwonlyargs > 255) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	771 ast_error(n, "more than 255 arguments");
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	772 return NULL;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	773 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	774
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	775 /* tname: NAME [':' test]
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	776 tfpdef: tname \| '(' tfplist ')'
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	777 tfplist: tfpdef (',' tfpdef)* [',']
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	778 vname: NAME
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	779 vfpdef: NAME \| '(' vfplist ')'
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	780 vfplist: vfpdef (',' vfpdef)* [',']
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	781 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	782 i = 0;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	783 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	784 k = 0; /* index for args */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	785 while (i < NCH(n)) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	786 ch = CHILD(n, i);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	787 switch (TYPE(ch)) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	788 case tfpdef:
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	789 case vfpdef:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	790 /* XXX Need to worry about checking if TYPE(CHILD(n, i+1)) is
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	791 anything other than EQUAL or a comma? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	792 /* XXX Should NCH(n) check be made a separate check? */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	793 if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	794 expr_ty expression = ast_for_expr(c, CHILD(n, i + 2));
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	795 if (!expression)
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	796 goto error;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	797 assert(posdefaults != NULL);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	798 asdl_seq_SET(posdefaults, j++, expression);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	799 i += 2;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	800 found_default = 1;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	801 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	802 else if (found_default) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	803 ast_error(n,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	804 "non-default argument follows default argument");
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	805 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	806 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	807 /* def foo((x)): is not complex, special case. */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	808 while (NCH(ch) == 3 && NCH(CHILD(ch, 1)) == 1)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	809 ch = CHILD(CHILD(ch, 1), 0);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	810
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	811 if (NCH(ch) != 1)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	812 arg = compiler_complex_args(c, CHILD(ch, 1));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	813 else
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	814 arg = compiler_simple_arg(c, CHILD(ch, 0));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	815 if (!arg)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	816 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	817 asdl_seq_SET(posargs, k++, arg);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	818
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	819 i += 2; /* the name and the comma */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	820 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	821 case STAR:
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	822 if (i+1 >= NCH(n)) {
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	823 ast_error(CHILD(n, i), "no name for vararg");
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	824 goto error;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	825 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	826 ch = CHILD(n, i+1); /* tname or COMMA */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	827 if (TYPE(ch) == COMMA) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	828 int res = 0;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	829 i += 2; /* now follows keyword only arguments */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	830 res = handle_keywordonly_args(c, n, i,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	831 kwonlyargs, kwdefaults);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	832 if (res == -1) goto error;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	833 i = res; /* res has new position to process */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	834 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	835 else if (!strcmp(STR(CHILD(ch, 0)), "None")) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	836 ast_error(CHILD(ch, 0), "assignment to None");
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	837 goto error;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	838 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	839 else {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	840 vararg = NEW_IDENTIFIER(CHILD(ch, 0));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	841 if (NCH(ch) > 1) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	842 /* there is an annotation on the vararg */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	843 varargannotation = ast_for_expr(c, CHILD(ch, 2));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	844 }
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	845 i += 3;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	846 if (i < NCH(n) && (TYPE(CHILD(n, i)) == tname
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	847 \|\| TYPE(CHILD(n, i)) == vname)) {
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	848 int res = 0;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	849 res = handle_keywordonly_args(c, n, i,
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	850 kwonlyargs, kwdefaults);
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	851 if (res == -1) goto error;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	852 i = res; /* res has new position to process */
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	853 }
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	854 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	855 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	856 case DOUBLESTAR:
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	857 ch = CHILD(n, i+1); /* tname */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	858 assert(TYPE(ch) == tname \|\| TYPE(ch) == vname);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	859 if (!strcmp(STR(CHILD(ch, 0)), "None")) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	860 ast_error(CHILD(ch, 0), "assignment to None");
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	861 goto error;
1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	862 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	863 kwarg = NEW_IDENTIFIER(CHILD(ch, 0));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	864 if (NCH(ch) > 1) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	865 /* there is an annotation on the kwarg */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	866 kwargannotation = ast_for_expr(c, CHILD(ch, 2));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	867 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	868 i += 3;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	869 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	870 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	871 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	872 "unexpected node in varargslist: %d @ %d",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	873 TYPE(ch), i);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	874 goto error;
40215 1cce0526d9b0 Jiwon Seo's PEP 3102 implementation. Guido van Rossum <guido@python.org> parents: 39783 diff changeset	875 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	876 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	877 return arguments(posargs, vararg, varargannotation, kwonlyargs, kwarg,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	878 kwargannotation, posdefaults, kwdefaults, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	879 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	880 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	881 Py_XDECREF(kwarg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	882 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	883 }
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 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	886 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	887 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	888 expr_ty e;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	889 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	890 int lineno, col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	891 int i;
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 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	894
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	895 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	896 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	897
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	898 id = NEW_IDENTIFIER(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	899 if (!id)
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	900 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	901 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	902 if (!e)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	903 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	904
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	905 for (i = 2; i < NCH(n); i+=2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	906 id = NEW_IDENTIFIER(CHILD(n, i));
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	907 if (!id)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	908 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	909 e = Attribute(e, id, Load, lineno, col_offset, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	910 if (!e)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	911 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	912 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	913
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	914 return e;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	915 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	916
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	917 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	918 ast_for_decorator(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	919 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	920 /* decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	921 expr_ty d = NULL;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	922 expr_ty name_expr;
35742 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 REQ(n, decorator);
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	925 REQ(CHILD(n, 0), AT);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	926 REQ(RCHILD(n, -1), NEWLINE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	927
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	928 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	929 if (!name_expr)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	930 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	931
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	932 if (NCH(n) == 3) { /* No arguments */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	933 d = name_expr;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	934 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	935 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	936 else if (NCH(n) == 5) { /* Call with no arguments */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	937 d = Call(name_expr, NULL, NULL, NULL, NULL, LINENO(n),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	938 n->n_col_offset, c->c_arena);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	939 if (!d)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	940 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	941 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	942 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	943 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	944 d = ast_for_call(c, CHILD(n, 3), name_expr);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	945 if (!d)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	946 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	947 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	948 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	949
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	950 return d;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	951 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	952
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	953 static asdl_seq*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	954 ast_for_decorators(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	955 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	956 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	957 expr_ty d;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	958 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	959
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	960 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	961 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	962 if (!decorator_seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	963 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	964
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	965 for (i = 0; i < NCH(n); i++) {
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	966 d = ast_for_decorator(c, CHILD(n, i));
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	967 if (!d)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	968 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	969 asdl_seq_SET(decorator_seq, i, d);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	970 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	971 return decorator_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	972 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	973
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	974 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	975 ast_for_funcdef(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	976 {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	977 /* funcdef: 'def' [decorators] NAME parameters ['->' test] ':' suite */
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	978 identifier name;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	979 arguments_ty args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	980 asdl_seq *body;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	981 asdl_seq *decorator_seq = NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	982 expr_ty returns = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	983 int name_i;
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 REQ(n, funcdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	986
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	987 if (NCH(n) == 6) { /* decorators are present */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	988 decorator_seq = ast_for_decorators(c, CHILD(n, 0));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	989 if (!decorator_seq)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	990 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	991 name_i = 2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	992 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	993 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	994 name_i = 1;
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	997 name = NEW_IDENTIFIER(CHILD(n, name_i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	998 if (!name)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	999 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1000 else if (!strcmp(STR(CHILD(n, name_i)), "None")) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1001 ast_error(CHILD(n, name_i), "assignment to None");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1002 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1003 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1004 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	1005 if (!args)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1006 return NULL;
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1007 if (TYPE(CHILD(n, name_i+2)) == RARROW) {
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1008 returns = ast_for_expr(c, CHILD(n, name_i + 3));
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1009 if (!returns)
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1010 return NULL;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1011 name_i += 2;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1012 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1013 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	1014 if (!body)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1015 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1016
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1017 return FunctionDef(name, args, body, decorator_seq, returns, LINENO(n),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1018 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1019 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1020
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1021 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1022 ast_for_lambdef(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1023 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1024 /* lambdef: 'lambda' [varargslist] ':' test */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1025 arguments_ty args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1026 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1027
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1028 if (NCH(n) == 3) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1029 args = arguments(NULL, NULL, NULL, NULL, NULL, NULL, NULL,
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1030 NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1031 if (!args)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1032 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1033 expression = ast_for_expr(c, CHILD(n, 2));
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	1034 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1035 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1036 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1037 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1038 args = ast_for_arguments(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1039 if (!args)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1040 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1041 expression = ast_for_expr(c, CHILD(n, 3));
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	1042 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1043 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1044 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1045
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1046 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	1047 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1048
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1049 static expr_ty
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1050 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	1051 {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1052 /* 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	1053 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	1054
36676 67c74efad8c2 Fix old not-reading-pep-308-right artifact. Thomas Wouters <thomas@python.org> parents: 36670 diff changeset	1055 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	1056 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	1057 if (!body)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1058 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1059 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	1060 if (!expression)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1061 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1062 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	1063 if (!orelse)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1064 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1065 return IfExp(expression, body, orelse, LINENO(n), n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1066 c->c_arena);
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1067 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1068
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1069 /* XXX(nnorwitz): the listcomp and genexpr code should be refactored
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1070 so there is only a single version. Possibly for loops can also re-use
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1071 the code.
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1072 */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1073
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1074 /* 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	1075
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1076 Helper for ast_for_listcomp().
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1079 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1080 count_list_fors(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1081 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1082 int n_fors = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1083 node *ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1084
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1085 count_list_for:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1086 n_fors++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1087 REQ(ch, list_for);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1088 if (NCH(ch) == 5)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1089 ch = CHILD(ch, 4);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1090 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1091 return n_fors;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1092 count_list_iter:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1093 REQ(ch, list_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1094 ch = CHILD(ch, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1095 if (TYPE(ch) == list_for)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1096 goto count_list_for;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1097 else if (TYPE(ch) == list_if) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1098 if (NCH(ch) == 3) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1099 ch = CHILD(ch, 2);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1100 goto count_list_iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1101 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1102 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1103 return n_fors;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1104 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1105
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1106 /* Should never be reached */
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1107 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	1108 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1109 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1110
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1111 /* 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	1112
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1113 Helper for ast_for_listcomp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1114 */
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1117 count_list_ifs(const node *n)
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 int n_ifs = 0;
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 count_list_iter:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1122 REQ(n, list_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1123 if (TYPE(CHILD(n, 0)) == list_for)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1124 return n_ifs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1125 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1126 REQ(n, list_if);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1127 n_ifs++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1128 if (NCH(n) == 2)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1129 return n_ifs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1130 n = CHILD(n, 2);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1131 goto count_list_iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1132 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1133
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1134 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1135 ast_for_listcomp(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1136 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1137 /* listmaker: test ( list_for \| (',' test)* [','] )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1138 list_for: 'for' exprlist 'in' testlist_safe [list_iter]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1139 list_iter: list_for \| list_if
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1140 list_if: 'if' test [list_iter]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1141 testlist_safe: test [(',' test)+ [',']]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1142 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1143 expr_ty elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1144 asdl_seq *listcomps;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1145 int i, n_fors;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1146 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1147
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1148 REQ(n, listmaker);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1149 assert(NCH(n) > 1);
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 elt = ast_for_expr(c, CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1152 if (!elt)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1153 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1154
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1155 n_fors = count_list_fors(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1156 if (n_fors == -1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1157 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1158
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	1159 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	1160 if (!listcomps)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1161 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	1162
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1163 ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1164 for (i = 0; i < n_fors; i++) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1165 comprehension_ty lc;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1166 asdl_seq *t;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1167 expr_ty expression;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1168 node *for_ch;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1169
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1170 REQ(ch, list_for);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1171
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1172 for_ch = CHILD(ch, 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1173 t = ast_for_exprlist(c, for_ch, Store);
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	1174 if (!t)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1175 return NULL;
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1176 expression = ast_for_testlist(c, CHILD(ch, 3));
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	1177 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1178 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1179
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1180 /* Check the # of children rather than the length of t, since
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1181 [x for x, in ... ] has 1 element in t, but still requires a Tuple. */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1182 if (NCH(for_ch) == 1)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1183 lc = comprehension((expr_ty)asdl_seq_GET(t, 0), expression, 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	1184 c->c_arena);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1185 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1186 lc = comprehension(Tuple(t, Store, LINENO(ch), ch->n_col_offset,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1187 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	1188 expression, NULL, 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	1189 if (!lc)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1190 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1191
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1192 if (NCH(ch) == 5) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1193 int j, n_ifs;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1194 asdl_seq *ifs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1195
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1196 ch = CHILD(ch, 4);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1197 n_ifs = count_list_ifs(ch);
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	1198 if (n_ifs == -1)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1199 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1200
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1201 ifs = asdl_seq_new(n_ifs, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1202 if (!ifs)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1203 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1204
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1205 for (j = 0; j < n_ifs; j++) {
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1206 REQ(ch, list_iter);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1207 ch = CHILD(ch, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1208 REQ(ch, list_if);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1209
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1210 asdl_seq_SET(ifs, j, ast_for_expr(c, CHILD(ch, 1)));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1211 if (NCH(ch) == 3)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1212 ch = CHILD(ch, 2);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1213 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1214 /* on exit, must guarantee that ch is a list_for */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1215 if (TYPE(ch) == list_iter)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1216 ch = CHILD(ch, 0);
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1217 lc->ifs = ifs;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1218 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1219 asdl_seq_SET(listcomps, i, lc);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1220 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1221
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1222 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	1223 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1224
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1225 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1226 Count the number of 'for' loops in a generator expression.
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 Helper for ast_for_genexp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1229 */
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 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1232 count_gen_fors(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1233 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1234 int n_fors = 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1235 node *ch = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1236
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1237 count_gen_for:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1238 n_fors++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1239 REQ(ch, gen_for);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1240 if (NCH(ch) == 5)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1241 ch = CHILD(ch, 4);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1242 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1243 return n_fors;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1244 count_gen_iter:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1245 REQ(ch, gen_iter);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1246 ch = CHILD(ch, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1247 if (TYPE(ch) == gen_for)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1248 goto count_gen_for;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1249 else if (TYPE(ch) == gen_if) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1250 if (NCH(ch) == 3) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1251 ch = CHILD(ch, 2);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1252 goto count_gen_iter;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1253 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1254 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1255 return n_fors;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1256 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1257
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1258 /* Should never be reached */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1259 PyErr_SetString(PyExc_SystemError,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1260 "logic error in count_gen_fors");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1261 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1262 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1263
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1264 /* 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	1265
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1266 Helper for ast_for_genexp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1267 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1268
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1269 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1270 count_gen_ifs(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1271 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1272 int n_ifs = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1273
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1274 while (1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1275 REQ(n, gen_iter);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1276 if (TYPE(CHILD(n, 0)) == gen_for)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1277 return n_ifs;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1278 n = CHILD(n, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1279 REQ(n, gen_if);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1280 n_ifs++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1281 if (NCH(n) == 2)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1282 return n_ifs;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1283 n = CHILD(n, 2);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1284 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1285 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1286
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1287 /* TODO(jhylton): Combine with list comprehension code? */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1288 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1289 ast_for_genexp(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1290 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1291 /* testlist_gexp: test ( gen_for \| (',' test)* [','] )
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1292 argument: [test '='] test [gen_for] # Really [keyword '='] test */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1293 expr_ty elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1294 asdl_seq *genexps;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1295 int i, n_fors;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1296 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1297
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1298 assert(TYPE(n) == (testlist_gexp) \|\| TYPE(n) == (argument));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1299 assert(NCH(n) > 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1300
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1301 elt = ast_for_expr(c, CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1302 if (!elt)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1303 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1304
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1305 n_fors = count_gen_fors(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1306 if (n_fors == -1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1307 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	1308
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	1309 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	1310 if (!genexps)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1311 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	1312
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1313 ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1314 for (i = 0; i < n_fors; i++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1315 comprehension_ty ge;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1316 asdl_seq *t;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1317 expr_ty expression;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1318 node *for_ch;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1319
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1320 REQ(ch, gen_for);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1321
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1322 for_ch = CHILD(ch, 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1323 t = ast_for_exprlist(c, for_ch, Store);
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	1324 if (!t)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1325 return NULL;
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1326 expression = ast_for_expr(c, CHILD(ch, 3));
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	1327 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1328 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	1329
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1330 /* Check the # of children rather than the length of t, since
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1331 (x for x, in ...) has 1 element in t, but still requires a Tuple. */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1332 if (NCH(for_ch) == 1)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1333 ge = comprehension((expr_ty)asdl_seq_GET(t, 0), 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	1334 NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1335 else
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1336 ge = comprehension(Tuple(t, Store, LINENO(ch), ch->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1337 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	1338 expression, NULL, 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	1339
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	1340 if (!ge)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1341 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	1342
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1343 if (NCH(ch) == 5) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1344 int j, n_ifs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1345 asdl_seq *ifs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1346
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1347 ch = CHILD(ch, 4);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1348 n_ifs = count_gen_ifs(ch);
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	1349 if (n_ifs == -1)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1350 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	1351
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	1352 ifs = asdl_seq_new(n_ifs, 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	1353 if (!ifs)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 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
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1356 for (j = 0; j < n_ifs; j++) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1357 REQ(ch, gen_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1358 ch = CHILD(ch, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1359 REQ(ch, gen_if);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1360
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1361 expression = ast_for_expr(c, CHILD(ch, 1));
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	1362 if (!expression)
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1363 return NULL;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1364 asdl_seq_SET(ifs, j, expression);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1365 if (NCH(ch) == 3)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1366 ch = CHILD(ch, 2);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1367 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1368 /* on exit, must guarantee that ch is a gen_for */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1369 if (TYPE(ch) == gen_iter)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1370 ch = CHILD(ch, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1371 ge->ifs = ifs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1372 }
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1373 asdl_seq_SET(genexps, i, ge);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1374 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1375
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1376 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	1377 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1378
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1379 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1380 ast_for_atom(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1381 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1382 /* atom: '(' [yield_expr\|testlist_gexp] ')' \| '[' [listmaker] ']'
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1383 \| '{' [dictsetmaker] '}' \| NAME \| NUMBER \| STRING+
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1384 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1385 node *ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1386
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1387 switch (TYPE(ch)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1388 case NAME:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1389 /* All names start in Load context, but may later be
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1390 changed. */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1391 return Name(NEW_IDENTIFIER(ch), 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	1392 case STRING: {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1393 PyObject *str = parsestrplus(c, n);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1394 if (!str)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1395 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	1396
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1397 PyArena_AddPyObject(c->c_arena, str);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1398 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	1399 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1400 case NUMBER: {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1401 PyObject *pynum = parsenumber(STR(ch));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1402 if (!pynum)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1403 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	1404
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1405 PyArena_AddPyObject(c->c_arena, pynum);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1406 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	1407 }
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1408 case DOT: /* Ellipsis */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1409 return Ellipsis(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	1410 case LPAR: /* some parenthesized expressions */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1411 ch = CHILD(n, 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1412
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1413 if (TYPE(ch) == RPAR)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1414 return Tuple(NULL, Load, LINENO(n), n->n_col_offset, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1415
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1416 if (TYPE(ch) == yield_expr)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1417 return ast_for_expr(c, ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1418
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1419 if ((NCH(ch) > 1) && (TYPE(CHILD(ch, 1)) == gen_for))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1420 return ast_for_genexp(c, ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1421
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1422 return ast_for_testlist_gexp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1423 case LSQB: /* list (or list comprehension) */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1424 ch = CHILD(n, 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1425
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1426 if (TYPE(ch) == RSQB)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1427 return List(NULL, Load, LINENO(n), n->n_col_offset, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1428
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1429 REQ(ch, listmaker);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1430 if (NCH(ch) == 1 \|\| TYPE(CHILD(ch, 1)) == COMMA) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1431 asdl_seq *elts = seq_for_testlist(c, ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1432 if (!elts)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1433 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	1434
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1435 return List(elts, Load, LINENO(n), n->n_col_offset, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1436 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1437 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1438 return ast_for_listcomp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1439 case LBRACE: {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1440 /* dictsetmaker: test ':' test (',' test ':' test)* [','] \|
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1441 * test (',' test)* [','] */
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1442 int i, size;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1443 asdl_seq keys, values;
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1444
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1445 ch = CHILD(n, 1);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	1446 if (NCH(ch) == 1 \|\| (NCH(ch) > 0 && STR(CHILD(ch, 1))[0] == ',')) {
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1447 /* it's a set */
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1448 size = (NCH(ch) + 1) / 2; /* +1 in case no trailing comma */
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1449 keys = asdl_seq_new(size, c->c_arena);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1450 if (!keys)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1451 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	1452
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1453 for (i = 0; i < NCH(ch); i += 2) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1454 expr_ty expression;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1455 expression = ast_for_expr(c, CHILD(ch, i));
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1456 if (!expression)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1457 return NULL;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1458 asdl_seq_SET(keys, i / 2, expression);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1459 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1460 return Set(keys, LINENO(n), n->n_col_offset, c->c_arena);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1461 } else {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1462 /* it's a dict */
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1463 size = (NCH(ch) + 1) / 4; /* +1 in case no trailing comma */
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1464 keys = asdl_seq_new(size, c->c_arena);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1465 if (!keys)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1466 return NULL;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1467
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1468 values = asdl_seq_new(size, c->c_arena);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1469 if (!values)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1470 return NULL;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1471
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1472 for (i = 0; i < NCH(ch); i += 4) {
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1473 expr_ty expression;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1474
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1475 expression = ast_for_expr(c, CHILD(ch, i));
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1476 if (!expression)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1477 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	1478
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1479 asdl_seq_SET(keys, i / 4, expression);
35873 76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	1480
39693 d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1481 expression = ast_for_expr(c, CHILD(ch, i + 2));
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1482 if (!expression)
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1483 return NULL;
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1484
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1485 asdl_seq_SET(values, i / 4, expression);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1486 }
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1487 return Dict(keys, values, LINENO(n), n->n_col_offset, c->c_arena);
d0b83c4630c0 SF patch 1547796 by Georg Brandl -- set literals. Guido van Rossum <guido@python.org> parents: 39678 diff changeset	1488 }
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 default:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1491 PyErr_Format(PyExc_SystemError, "unhandled atom %d", TYPE(ch));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1492 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1493 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1494 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1495
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1496 static slice_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1497 ast_for_slice(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1498 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1499 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1500 expr_ty lower = NULL, upper = NULL, step = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1501
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1502 REQ(n, subscript);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1503
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1504 /*
39783 7a0ad110e91e Patch #1550786: ellipsis literal. Georg Brandl <georg@python.org> parents: 39782 diff changeset	1505 subscript: test \| [test] ':' [test] [sliceop]
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1506 sliceop: ':' [test]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1507 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1508 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1509 if (NCH(n) == 1 && TYPE(ch) == test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1510 /* 'step' variable hold no significance in terms of being used over
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1511 other vars */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1512 step = ast_for_expr(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1513 if (!step)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1514 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1515
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1516 return Index(step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1517 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1518
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1519 if (TYPE(ch) == test) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1520 lower = ast_for_expr(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1521 if (!lower)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1522 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1523 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1524
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1525 /* 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	1526 if (TYPE(ch) == COLON) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1527 if (NCH(n) > 1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1528 node *n2 = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1529
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1530 if (TYPE(n2) == test) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1531 upper = ast_for_expr(c, n2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1532 if (!upper)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1533 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1534 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1535 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1536 } else if (NCH(n) > 2) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1537 node *n2 = CHILD(n, 2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1538
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1539 if (TYPE(n2) == test) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1540 upper = ast_for_expr(c, n2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1541 if (!upper)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1542 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1543 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1544 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1545
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1546 ch = CHILD(n, NCH(n) - 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1547 if (TYPE(ch) == sliceop) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1548 if (NCH(ch) == 1) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1549 /* No expression, so step is None */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1550 ch = CHILD(ch, 0);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1551 step = Name(new_identifier("None", c->c_arena), Load,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1552 LINENO(ch), ch->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1553 if (!step)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1554 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1555 } else {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1556 ch = CHILD(ch, 1);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1557 if (TYPE(ch) == test) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1558 step = ast_for_expr(c, ch);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1559 if (!step)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1560 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1561 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1562 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1563 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1564
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	1565 return Slice(lower, upper, step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1566 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1567
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1568 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1569 ast_for_binop(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1570 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1571 /* Must account for a sequence of expressions.
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1572 How should A op B op C by represented?
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1573 BinOp(BinOp(A, op, B), op, C).
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1574 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1575
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1576 int i, nops;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1577 expr_ty expr1, expr2, result;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1578 operator_ty newoperator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1579
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1580 expr1 = ast_for_expr(c, CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1581 if (!expr1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1582 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1583
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1584 expr2 = ast_for_expr(c, CHILD(n, 2));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1585 if (!expr2)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1586 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1587
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1588 newoperator = get_operator(CHILD(n, 1));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1589 if (!newoperator)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1590 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1591
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1592 result = BinOp(expr1, newoperator, expr2, LINENO(n), n->n_col_offset,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1593 c->c_arena);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1594 if (!result)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1595 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1596
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1597 nops = (NCH(n) - 1) / 2;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1598 for (i = 1; i < nops; i++) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1599 expr_ty tmp_result, tmp;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1600 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	1601
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1602 newoperator = get_operator(next_oper);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1603 if (!newoperator)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1604 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1605
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1606 tmp = ast_for_expr(c, CHILD(n, i * 2 + 2));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1607 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1608 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1609
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1610 tmp_result = BinOp(result, newoperator, tmp,
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1611 LINENO(next_oper), next_oper->n_col_offset,
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1612 c->c_arena);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1613 if (!tmp)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1614 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1615 result = tmp_result;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1616 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1617 return result;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1618 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1619
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1620 static expr_ty
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1621 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	1622 {
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1623 /* trailer: '(' [arglist] ')' \| '[' subscriptlist ']' \| '.' NAME
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1624 subscriptlist: subscript (',' subscript)* [',']
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1625 subscript: '.' '.' '.' \| test \| [test] ':' [test] [sliceop]
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1626 */
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1627 REQ(n, trailer);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1628 if (TYPE(CHILD(n, 0)) == LPAR) {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1629 if (NCH(n) == 2)
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1630 return Call(left_expr, NULL, NULL, NULL, NULL, LINENO(n),
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1631 n->n_col_offset, c->c_arena);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1632 else
36679 e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1633 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	1634 }
36679 e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1635 else if (TYPE(CHILD(n, 0)) == DOT ) {
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1636 return Attribute(left_expr, NEW_IDENTIFIER(CHILD(n, 1)), Load,
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1637 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	1638 }
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1639 else {
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1640 REQ(CHILD(n, 0), LSQB);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1641 REQ(CHILD(n, 2), RSQB);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1642 n = CHILD(n, 1);
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1643 if (NCH(n) == 1) {
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1644 slice_ty slc = ast_for_slice(c, CHILD(n, 0));
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1645 if (!slc)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1646 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1647 return Subscript(left_expr, slc, Load, LINENO(n), n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1648 c->c_arena);
35799 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 else {
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1651 /* The grammar is ambiguous here. The ambiguity is resolved
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1652 by treating the sequence as a tuple literal if there are
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1653 no slice features.
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1654 */
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1655 int j;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1656 slice_ty slc;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1657 expr_ty e;
36780 376792bfb57e Fix uninitialized value. (Why are we using bools instead of ints, like we do Thomas Wouters <thomas@python.org> parents: 36742 diff changeset	1658 bool simple = true;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1659 asdl_seq slices, elts;
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1660 slices = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1661 if (!slices)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1662 return NULL;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1663 for (j = 0; j < NCH(n); j += 2) {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1664 slc = ast_for_slice(c, CHILD(n, j));
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	1665 if (!slc)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1666 return NULL;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1667 if (slc->kind != Index_kind)
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1668 simple = false;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1669 asdl_seq_SET(slices, j / 2, slc);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1670 }
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1671 if (!simple) {
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1672 return Subscript(left_expr, ExtSlice(slices, c->c_arena),
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1673 Load, LINENO(n), n->n_col_offset, c->c_arena);
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1674 }
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1675 /* extract Index values and put them in a Tuple */
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1676 elts = asdl_seq_new(asdl_seq_LEN(slices), c->c_arena);
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36786 diff changeset	1677 if (!elts)
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36786 diff changeset	1678 return NULL;
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1679 for (j = 0; j < asdl_seq_LEN(slices); ++j) {
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1680 slc = (slice_ty)asdl_seq_GET(slices, j);
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1681 assert(slc->kind == Index_kind && slc->v.Index.value);
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1682 asdl_seq_SET(elts, j, slc->v.Index.value);
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1683 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1684 e = Tuple(elts, Load, LINENO(n), n->n_col_offset, c->c_arena);
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1685 if (!e)
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1686 return NULL;
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1687 return Subscript(left_expr, Index(e, c->c_arena),
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1688 Load, LINENO(n), n->n_col_offset, c->c_arena);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1689 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1690 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1691 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1692
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1693 static expr_ty
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1694 ast_for_factor(struct compiling c, const node n)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1695 {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1696 node pfactor, ppower, patom, pnum;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1697 expr_ty expression;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1698
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1699 /* If the unary - operator is applied to a constant, don't generate
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1700 a UNARY_NEGATIVE opcode. Just store the approriate value as a
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1701 constant. The peephole optimizer already does something like
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1702 this but it doesn't handle the case where the constant is
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1703 (sys.maxint - 1). In that case, we want a PyIntObject, not a
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1704 PyLongObject.
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1705 */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1706 if (TYPE(CHILD(n, 0)) == MINUS
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1707 && NCH(n) == 2
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1708 && TYPE((pfactor = CHILD(n, 1))) == factor
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1709 && NCH(pfactor) == 1
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1710 && TYPE((ppower = CHILD(pfactor, 0))) == power
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1711 && NCH(ppower) == 1
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1712 && TYPE((patom = CHILD(ppower, 0))) == atom
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1713 && TYPE((pnum = CHILD(patom, 0))) == NUMBER) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1714 char *s = PyObject_MALLOC(strlen(STR(pnum)) + 2);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1715 if (s == NULL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1716 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1717 s[0] = '-';
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1718 strcpy(s + 1, STR(pnum));
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1719 PyObject_FREE(STR(pnum));
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1720 STR(pnum) = s;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1721 return ast_for_atom(c, patom);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1722 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1723
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1724 expression = ast_for_expr(c, CHILD(n, 1));
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1725 if (!expression)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1726 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1727
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1728 switch (TYPE(CHILD(n, 0))) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1729 case PLUS:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1730 return UnaryOp(UAdd, expression, LINENO(n), n->n_col_offset,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1731 c->c_arena);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1732 case MINUS:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1733 return UnaryOp(USub, expression, LINENO(n), n->n_col_offset,
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1734 c->c_arena);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1735 case TILDE:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1736 return UnaryOp(Invert, expression, LINENO(n),
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1737 n->n_col_offset, c->c_arena);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1738 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1739 PyErr_Format(PyExc_SystemError, "unhandled factor: %d",
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1740 TYPE(CHILD(n, 0)));
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1741 return NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1742 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1743
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1744 static expr_ty
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1745 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	1746 {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1747 /* power: atom trailer* ('*' factor)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1748 */
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1749 int i;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1750 expr_ty e, tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1751 REQ(n, power);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1752 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	1753 if (!e)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1754 return NULL;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1755 if (NCH(n) == 1)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1756 return e;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1757 for (i = 1; i < NCH(n); i++) {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1758 node *ch = CHILD(n, i);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1759 if (TYPE(ch) != trailer)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1760 break;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1761 tmp = ast_for_trailer(c, ch, e);
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	1762 if (!tmp)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1763 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1764 tmp->lineno = e->lineno;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1765 tmp->col_offset = e->col_offset;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1766 e = tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1767 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1768 if (TYPE(CHILD(n, NCH(n) - 1)) == factor) {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1769 expr_ty f = ast_for_expr(c, CHILD(n, NCH(n) - 1));
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	1770 if (!f)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1771 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	1772 tmp = BinOp(e, Pow, f, LINENO(n), n->n_col_offset, 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	1773 if (!tmp)
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1774 return NULL;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1775 e = tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1776 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1777 return e;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1778 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1779
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1780 /* 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	1781 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1782
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1783 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1784 ast_for_expr(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1785 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1786 /* 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	1787 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	1788 or_test: and_test ('or' and_test)*
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1789 and_test: not_test ('and' not_test)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1790 not_test: 'not' not_test \| comparison
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1791 comparison: expr (comp_op expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1792 expr: xor_expr ('\|' xor_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1793 xor_expr: and_expr ('^' and_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1794 and_expr: shift_expr ('&' shift_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1795 shift_expr: arith_expr (('<<'\|'>>') arith_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1796 arith_expr: term (('+'\|'-') term)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1797 term: factor ((''\|'/'\|'%'\|'//') factor)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1798 factor: ('+'\|'-'\|'~') factor \| power
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1799 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	1800
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1801 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	1802 to explicitly allow:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1803 [ 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	1804 (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	1805
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1806 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	1807 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	1808
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1811 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1812 int i;
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 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1815 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1816 case test:
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1817 case old_test:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1818 if (TYPE(CHILD(n, 0)) == lambdef \|\|
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1819 TYPE(CHILD(n, 0)) == old_lambdef)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1820 return ast_for_lambdef(c, CHILD(n, 0));
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1821 else if (NCH(n) > 1)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1822 return ast_for_ifexpr(c, n);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1823 /* Fallthrough */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1824 case or_test:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1825 case and_test:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1826 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1827 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1828 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1829 }
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	1830 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	1831 if (!seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1832 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1833 for (i = 0; i < NCH(n); i += 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1834 expr_ty e = ast_for_expr(c, CHILD(n, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1835 if (!e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1836 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1837 asdl_seq_SET(seq, i / 2, e);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1838 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1839 if (!strcmp(STR(CHILD(n, 1)), "and"))
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1840 return BoolOp(And, seq, LINENO(n), n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1841 c->c_arena);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1842 assert(!strcmp(STR(CHILD(n, 1)), "or"));
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1843 return BoolOp(Or, seq, 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	1844 case not_test:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1845 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1846 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1847 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1848 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1849 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1850 expr_ty expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1851 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1852 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1853
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1854 return UnaryOp(Not, expression, LINENO(n), n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1855 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1856 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1857 case comparison:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1858 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1859 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1860 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1861 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1862 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1863 expr_ty expression;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1864 asdl_int_seq *ops;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1865 asdl_seq *cmps;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1866 ops = asdl_int_seq_new(NCH(n) / 2, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1867 if (!ops)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1868 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	1869 cmps = 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	1870 if (!cmps) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1871 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1872 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1873 for (i = 1; i < NCH(n); i += 2) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1874 cmpop_ty newoperator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1875
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1876 newoperator = ast_for_comp_op(CHILD(n, i));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1877 if (!newoperator) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1878 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1879 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1880
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1881 expression = ast_for_expr(c, CHILD(n, i + 1));
35873 76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	1882 if (!expression) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1883 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1884 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1885
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1886 asdl_seq_SET(ops, i / 2, newoperator);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1887 asdl_seq_SET(cmps, i / 2, expression);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1888 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1889 expression = ast_for_expr(c, CHILD(n, 0));
35873 76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	1890 if (!expression) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1891 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1892 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1893
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1894 return Compare(expression, ops, cmps, LINENO(n),
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	1895 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1896 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1897 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1898
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1899 /* The next five cases all handle BinOps. The main body of code
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1900 is the same in each case, but the switch turned inside out to
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1901 reuse the code for each type of operator.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1902 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1903 case expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1904 case xor_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1905 case and_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1906 case shift_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1907 case arith_expr:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1908 case term:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1909 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1910 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1911 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1912 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1913 return ast_for_binop(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1914 case yield_expr: {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1915 expr_ty exp = NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1916 if (NCH(n) == 2) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1917 exp = ast_for_testlist(c, CHILD(n, 1));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1918 if (!exp)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1919 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1920 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1921 return Yield(exp, LINENO(n), n->n_col_offset, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1922 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1923 case factor:
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1924 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1925 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1926 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1927 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1928 return ast_for_factor(c, n);
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1929 case power:
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1930 return ast_for_power(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1931 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	1932 PyErr_Format(PyExc_SystemError, "unhandled expr: %d", TYPE(n));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1933 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1934 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1935 /* 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	1936 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1937 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1938
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1939 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1940 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	1941 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1942 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1943 arglist: (argument ',')* (argument [',']\| '' test [',' '*' test]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1944 \| '**' test)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1945 argument: [test '='] test [gen_for] # Really [keyword '='] test
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1946 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1947
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1948 int i, nargs, nkeywords, ngens;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1949 asdl_seq *args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1950 asdl_seq *keywords;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1951 expr_ty vararg = NULL, kwarg = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1952
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1953 REQ(n, arglist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1954
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1955 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1956 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1957 ngens = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1958 for (i = 0; i < NCH(n); i++) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1959 node *ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1960 if (TYPE(ch) == argument) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1961 if (NCH(ch) == 1)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1962 nargs++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1963 else if (TYPE(CHILD(ch, 1)) == gen_for)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1964 ngens++;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1965 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1966 nkeywords++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1967 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1968 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1969 if (ngens > 1 \|\| (ngens && (nargs \|\| nkeywords))) {
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	1970 ast_error(n, "Generator expression must be parenthesized "
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1971 "if not sole argument");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1972 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1973 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1974
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1975 if (nargs + nkeywords + ngens > 255) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1976 ast_error(n, "more than 255 arguments");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1977 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1978 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1979
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	1980 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	1981 if (!args)
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	1982 return NULL;
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	1983 keywords = asdl_seq_new(nkeywords, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1984 if (!keywords)
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	1985 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1986 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1987 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1988 for (i = 0; i < NCH(n); i++) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1989 node *ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1990 if (TYPE(ch) == argument) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1991 expr_ty e;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1992 if (NCH(ch) == 1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1993 if (nkeywords) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1994 ast_error(CHILD(ch, 0),
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1995 "non-keyword arg after keyword arg");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1996 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1997 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	1998 e = ast_for_expr(c, CHILD(ch, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1999 if (!e)
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	2000 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2001 asdl_seq_SET(args, nargs++, e);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2002 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2003 else if (TYPE(CHILD(ch, 1)) == gen_for) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2004 e = ast_for_genexp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2005 if (!e)
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	2006 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2007 asdl_seq_SET(args, nargs++, e);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2008 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2009 else {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2010 keyword_ty kw;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2011 identifier key;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2012
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2013 /* CHILD(ch, 0) is test, but must be an identifier? */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2014 e = ast_for_expr(c, CHILD(ch, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2015 if (!e)
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	2016 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2017 /* f(lambda x: x[0] = 3) ends up getting parsed with
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2018 * LHS test = lambda x: x[0], and RHS test = 3.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2019 * SF bug 132313 points out that complaining about a keyword
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2020 * then is very confusing.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2021 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2022 if (e->kind == Lambda_kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2023 ast_error(CHILD(ch, 0), "lambda cannot contain assignment");
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	2024 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2025 } else if (e->kind != Name_kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2026 ast_error(CHILD(ch, 0), "keyword can't be an 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	2027 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2028 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2029 key = e->v.Name.id;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2030 e = ast_for_expr(c, CHILD(ch, 2));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2031 if (!e)
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	2032 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2033 kw = keyword(key, e, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2034 if (!kw)
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	2035 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2036 asdl_seq_SET(keywords, nkeywords++, kw);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2037 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2038 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2039 else if (TYPE(ch) == STAR) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2040 vararg = ast_for_expr(c, CHILD(n, i+1));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2041 i++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2042 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2043 else if (TYPE(ch) == DOUBLESTAR) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2044 kwarg = ast_for_expr(c, CHILD(n, i+1));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2045 i++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2046 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2047 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2048
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2049 return Call(func, args, keywords, vararg, kwarg, func->lineno, func->col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2050 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2051
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2052 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	2053 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	2054 {
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2055 /* 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	2056 /* 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	2057 /* 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	2058 /* testlist1: test (',' test)* */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2059 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	2060 if (TYPE(n) == testlist_gexp) {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2061 if (NCH(n) > 1)
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2062 assert(TYPE(CHILD(n, 1)) != gen_for);
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2063 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2064 else {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2065 assert(TYPE(n) == testlist \|\|
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2066 TYPE(n) == testlist_safe \|\|
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2067 TYPE(n) == testlist1);
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2068 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2069 if (NCH(n) == 1)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2070 return ast_for_expr(c, CHILD(n, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2071 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2072 asdl_seq *tmp = seq_for_testlist(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2073 if (!tmp)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2074 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2075 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	2076 }
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2077 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2078
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2079 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	2080 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	2081 {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2082 /* 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	2083 /* 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	2084 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	2085 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == gen_for)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2086 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	2087 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	2088 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2089
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2090 /* 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	2091 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	2092 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	2093 {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2094 /* 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	2095 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	2096 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	2097 if (NCH(n) == 1) {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2098 expr_ty base;
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	2099 asdl_seq *bases = asdl_seq_new(1, c->c_arena);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2100 if (!bases)
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2101 return NULL;
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2102 base = ast_for_expr(c, CHILD(n, 0));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2103 if (!base)
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2104 return NULL;
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2105 asdl_seq_SET(bases, 0, base);
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2106 return bases;
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2107 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2108
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2109 return seq_for_testlist(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2110 }
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 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2113 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	2114 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2115 REQ(n, expr_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2116 /* expr_stmt: testlist (augassign (yield_expr\|testlist)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2117 \| ('=' (yield_expr\|testlist))*)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2118 testlist: test (',' test)* [',']
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2119 augassign: '+=' \| '-=' \| '*=' \| '/=' \| '%=' \| '&=' \| '\|=' \| '^='
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2120 \| '<<=' \| '>>=' \| '**=' \| '//='
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2121 test: ... here starts the operator precendence dance
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2122 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2123
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2124 if (NCH(n) == 1) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2125 expr_ty e = ast_for_testlist(c, CHILD(n, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2126 if (!e)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2127 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2128
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2129 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	2130 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2131 else if (TYPE(CHILD(n, 1)) == augassign) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2132 expr_ty expr1, expr2;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2133 operator_ty newoperator;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2134 node *ch = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2135
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2136 expr1 = ast_for_testlist(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2137 if (!expr1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2138 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2139 /* TODO(nas): Remove duplicated error checks (set_context does it) */
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2140 switch (expr1->kind) {
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2141 case GeneratorExp_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2142 ast_error(ch, "augmented assignment to generator "
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2143 "expression not possible");
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2144 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2145 case Yield_kind:
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2146 ast_error(ch, "augmented assignment to yield "
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2147 "expression not possible");
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2148 return NULL;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2149 case Name_kind: {
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2150 const char *var_name = PyString_AS_STRING(expr1->v.Name.id);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2151 if (var_name[0] == 'N' && !strcmp(var_name, "None")) {
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2152 ast_error(ch, "assignment to None");
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2153 return NULL;
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2154 }
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2155 break;
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2156 }
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2157 case Attribute_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2158 case Subscript_kind:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2159 break;
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2160 default:
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2161 ast_error(ch, "illegal expression for augmented "
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2162 "assignment");
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	2163 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2164 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2165 set_context(expr1, Store, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2166
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2167 ch = CHILD(n, 2);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2168 if (TYPE(ch) == testlist)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2169 expr2 = ast_for_testlist(c, ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2170 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2171 expr2 = ast_for_expr(c, ch);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2172 if (!expr2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2173 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2174
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2175 newoperator = ast_for_augassign(CHILD(n, 1));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2176 if (!newoperator)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2177 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2178
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2179 return AugAssign(expr1, newoperator, 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	2180 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2181 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2182 int i;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2183 asdl_seq *targets;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2184 node *value;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2185 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2186
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2187 /* a normal assignment */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2188 REQ(CHILD(n, 1), EQUAL);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2189 targets = asdl_seq_new(NCH(n) / 2, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2190 if (!targets)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2191 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2192 for (i = 0; i < NCH(n) - 2; i += 2) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2193 expr_ty e;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2194 node *ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2195 if (TYPE(ch) == yield_expr) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2196 ast_error(ch, "assignment to yield expression not possible");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2197 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2198 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2199 e = ast_for_testlist(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2200
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2201 /* set context to assign */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2202 if (!e)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2203 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2204
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2205 if (!set_context(e, Store, CHILD(n, i)))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2206 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2207
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2208 asdl_seq_SET(targets, i / 2, e);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2209 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2210 value = CHILD(n, NCH(n) - 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2211 if (TYPE(value) == testlist)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2212 expression = ast_for_testlist(c, value);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2213 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2214 expression = ast_for_expr(c, value);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2215 if (!expression)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2216 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2217 return Assign(targets, 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	2218 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2219 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2220
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2221 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2222 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	2223 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2224 /* print_stmt: 'print' ( [ test (',' test)* [','] ]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2225 \| '>>' test [ (',' test)+ [','] ] )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2226 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2227 expr_ty dest = NULL, expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2228 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2229 bool nl;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2230 int i, j, start = 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2231
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2232 REQ(n, print_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2233 if (NCH(n) >= 2 && TYPE(CHILD(n, 1)) == RIGHTSHIFT) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2234 dest = ast_for_expr(c, CHILD(n, 2));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2235 if (!dest)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2236 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2237 start = 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2238 }
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	2239 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	2240 if (!seq)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2241 return NULL;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2242 for (i = start, j = 0; i < NCH(n); i += 2, ++j) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2243 expression = ast_for_expr(c, CHILD(n, i));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2244 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2245 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2246 asdl_seq_SET(seq, j, expression);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2247 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2248 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	2249 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	2250 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2251
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2252 static asdl_seq *
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2253 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	2254 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2255 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2256 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2257 expr_ty e;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2258
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2259 REQ(n, exprlist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2260
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	2261 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	2262 if (!seq)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2263 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2264 for (i = 0; i < NCH(n); i += 2) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2265 e = ast_for_expr(c, CHILD(n, i));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2266 if (!e)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2267 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2268 asdl_seq_SET(seq, i / 2, e);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2269 if (context && !set_context(e, context, CHILD(n, i)))
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2270 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2271 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2272 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2273 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2274
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2275 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2276 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	2277 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2278 asdl_seq *expr_list;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2279
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2280 /* del_stmt: 'del' exprlist */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2281 REQ(n, del_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2282
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2283 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	2284 if (!expr_list)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2285 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	2286 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	2287 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2288
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2289 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2290 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	2291 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2292 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2293 flow_stmt: break_stmt \| continue_stmt \| return_stmt \| raise_stmt
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2294 \| yield_stmt
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2295 break_stmt: 'break'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2296 continue_stmt: 'continue'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2297 return_stmt: 'return' [testlist]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2298 yield_stmt: yield_expr
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2299 yield_expr: 'yield' testlist
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2300 raise_stmt: 'raise' [test [',' test [',' test]]]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2301 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2302 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2303
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2304 REQ(n, flow_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2305 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2306 switch (TYPE(ch)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2307 case break_stmt:
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2308 return Break(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	2309 case continue_stmt:
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2310 return Continue(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	2311 case yield_stmt: { /* will reduce to yield_expr */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2312 expr_ty exp = ast_for_expr(c, CHILD(ch, 0));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2313 if (!exp)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2314 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	2315 return Expr(exp, 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	2316 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2317 case return_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2318 if (NCH(ch) == 1)
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2319 return Return(NULL, 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	2320 else {
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2321 expr_ty expression = ast_for_testlist(c, CHILD(ch, 1));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2322 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2323 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	2324 return Return(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	2325 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2326 case raise_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2327 if (NCH(ch) == 1)
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2328 return Raise(NULL, NULL, NULL, 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	2329 else if (NCH(ch) == 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2330 expr_ty expression = ast_for_expr(c, CHILD(ch, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2331 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2332 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	2333 return Raise(expression, NULL, NULL, 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	2334 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2335 else if (NCH(ch) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2336 expr_ty expr1, expr2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2337
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2338 expr1 = ast_for_expr(c, CHILD(ch, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2339 if (!expr1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2340 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2341 expr2 = ast_for_expr(c, CHILD(ch, 3));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2342 if (!expr2)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2343 return NULL;
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 return Raise(expr1, expr2, NULL, 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	2346 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2347 else if (NCH(ch) == 6) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2348 expr_ty expr1, expr2, expr3;
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 expr1 = ast_for_expr(c, CHILD(ch, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2351 if (!expr1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2352 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2353 expr2 = ast_for_expr(c, CHILD(ch, 3));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2354 if (!expr2)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2355 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2356 expr3 = ast_for_expr(c, CHILD(ch, 5));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2357 if (!expr3)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2358 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2359
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2360 return Raise(expr1, expr2, expr3, 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	2361 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2362 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2363 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2364 "unexpected flow_stmt: %d", TYPE(ch));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2365 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2366 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2367
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2368 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	2369 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2370 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2371
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2372 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	2373 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	2374 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2375 /*
36742 658f8ff2a442 Make 'as' an actual keyword when with's future statement is used. Not Thomas Wouters <thomas@python.org> parents: 36718 diff changeset	2376 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	2377 dotted_as_name: dotted_name ['as' NAME]
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2378 dotted_name: NAME ('.' NAME)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2379 */
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	2380 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	2381
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2382 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2383 switch (TYPE(n)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2384 case import_as_name:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2385 str = NULL;
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2386 if (NCH(n) == 3) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2387 str = NEW_IDENTIFIER(CHILD(n, 2));
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2388 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2389 return alias(NEW_IDENTIFIER(CHILD(n, 0)), str, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2390 case dotted_as_name:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2391 if (NCH(n) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2392 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2393 goto loop;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2394 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2395 else {
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	2396 alias_ty a = alias_for_import_name(c, CHILD(n, 0));
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2397 if (!a)
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2398 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2399 assert(!a->asname);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2400 a->asname = NEW_IDENTIFIER(CHILD(n, 2));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2401 return a;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2402 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2403 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2404 case dotted_name:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2405 if (NCH(n) == 1)
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	2406 return alias(NEW_IDENTIFIER(CHILD(n, 0)), NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2407 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2408 /* Create a string of the form "a.b.c" */
36242 0f5189607264 Repair bizarre indentation created by VC 7.1. Tim Peters <tim.peters@gmail.com> parents: 36241 diff changeset	2409 int i;
36241 557e9b6ee7e1 alias_for_import_name(): Dueling compiler warnings ;-) Tim Peters <tim.peters@gmail.com> parents: 36231 diff changeset	2410 size_t len;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2411 char *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2412
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2413 len = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2414 for (i = 0; i < NCH(n); i += 2)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2415 /* length of string plus one for the dot */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2416 len += strlen(STR(CHILD(n, i))) + 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2417 len--; /* the last name doesn't have a dot */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2418 str = PyString_FromStringAndSize(NULL, len);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2419 if (!str)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2420 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2421 s = PyString_AS_STRING(str);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2422 if (!s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2423 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2424 for (i = 0; i < NCH(n); i += 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2425 char *sch = STR(CHILD(n, i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2426 strcpy(s, STR(CHILD(n, i)));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2427 s += strlen(sch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2428 *s++ = '.';
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2429 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2430 --s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2431 *s = '\0';
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2432 PyString_InternInPlace(&str);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2433 PyArena_AddPyObject(c->c_arena, str);
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	2434 return alias(str, NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2435 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2436 break;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2437 case STAR:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2438 str = PyString_InternFromString("*");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2439 PyArena_AddPyObject(c->c_arena, str);
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	2440 return alias(str, NULL, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2441 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2442 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2443 "unexpected import name: %d", TYPE(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2444 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2445 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2446
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2447 PyErr_SetString(PyExc_SystemError, "unhandled import name condition");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2448 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2449 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2450
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2451 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2452 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	2453 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2454 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2455 import_stmt: import_name \| import_from
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2456 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	2457 import_from: 'from' ('.'* dotted_name \| '.') 'import'
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2458 ('*' \| '(' import_as_names ')' \| import_as_names)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2459 */
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2460 int lineno;
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2461 int col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2462 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2463 asdl_seq *aliases;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2464
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2465 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	2466 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	2467 col_offset = n->n_col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2468 n = CHILD(n, 0);
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2469 if (TYPE(n) == import_name) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2470 n = CHILD(n, 1);
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2471 REQ(n, dotted_as_names);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2472 aliases = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2473 if (!aliases)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2474 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2475 for (i = 0; i < NCH(n); i += 2) {
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	2476 alias_ty import_alias = alias_for_import_name(c, CHILD(n, i));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2477 if (!import_alias)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2478 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2479 asdl_seq_SET(aliases, i / 2, import_alias);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2480 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2481 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	2482 }
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2483 else if (TYPE(n) == import_from) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2484 int n_children;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2485 int idx, ndots = 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2486 alias_ty mod = NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2487 identifier modname;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2488
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2489 /* Count the number of dots (for relative imports) and check for the
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2490 optional module name */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2491 for (idx = 1; idx < NCH(n); idx++) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2492 if (TYPE(CHILD(n, idx)) == dotted_name) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2493 mod = alias_for_import_name(c, CHILD(n, idx));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2494 idx++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2495 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2496 } else if (TYPE(CHILD(n, idx)) != DOT) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2497 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2498 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2499 ndots++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2500 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2501 idx++; /* skip over the 'import' keyword */
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2502 switch (TYPE(CHILD(n, idx))) {
36681 e9f0db429f2b Clean up from-import handling. Thomas Wouters <thomas@python.org> parents: 36679 diff changeset	2503 case STAR:
e9f0db429f2b Clean up from-import handling. Thomas Wouters <thomas@python.org> parents: 36679 diff changeset	2504 /* from ... import * */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2505 n = CHILD(n, idx);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2506 n_children = 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2507 if (ndots) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2508 ast_error(n, "'import *' not allowed with 'from .'");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2509 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2510 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2511 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2512 case LPAR:
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2513 /* from ... import (x, y, z) */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2514 n = CHILD(n, idx + 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2515 n_children = NCH(n);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2516 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2517 case import_as_names:
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2518 /* from ... import x, y, z */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2519 n = CHILD(n, idx);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2520 n_children = NCH(n);
36681 e9f0db429f2b Clean up from-import handling. Thomas Wouters <thomas@python.org> parents: 36679 diff changeset	2521 if (n_children % 2 == 0) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2522 ast_error(n, "trailing comma not allowed without"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2523 " surrounding parentheses");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2524 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2525 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2526 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2527 default:
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2528 ast_error(n, "Unexpected node-type in from-import");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2529 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2530 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2531
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2532 aliases = asdl_seq_new((n_children + 1) / 2, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2533 if (!aliases)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2534 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2535
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2536 /* handle "from ... import " special b/c there's no children /
36681 e9f0db429f2b Clean up from-import handling. Thomas Wouters <thomas@python.org> parents: 36679 diff changeset	2537 if (TYPE(n) == STAR) {
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	2538 alias_ty import_alias = alias_for_import_name(c, n);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2539 if (!import_alias)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2540 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2541 asdl_seq_SET(aliases, 0, import_alias);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2542 }
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2543 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2544 for (i = 0; i < NCH(n); i += 2) {
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2545 alias_ty import_alias = alias_for_import_name(c, CHILD(n, i));
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2546 if (!import_alias)
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2547 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2548 asdl_seq_SET(aliases, i / 2, import_alias);
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2549 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2550 }
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2551 if (mod != NULL)
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2552 modname = mod->name;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2553 else
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2554 modname = new_identifier("", c->c_arena);
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2555 return ImportFrom(modname, aliases, ndots, lineno, col_offset,
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2556 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2557 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2558 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2559 "unknown import statement: starts with command '%s'",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2560 STR(CHILD(n, 0)));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2561 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2562 }
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 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2565 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	2566 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2567 /* global_stmt: 'global' NAME (',' NAME)* */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2568 identifier name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2569 asdl_seq *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2570 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2571
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2572 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	2573 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	2574 if (!s)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2575 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2576 for (i = 1; i < NCH(n); i += 2) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2577 name = NEW_IDENTIFIER(CHILD(n, i));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2578 if (!name)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2579 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2580 asdl_seq_SET(s, i / 2, name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2581 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2582 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	2583 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2584
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2585 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2586 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	2587 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2588 /* assert_stmt: 'assert' test [',' test] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2589 REQ(n, assert_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2590 if (NCH(n) == 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2591 expr_ty expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2592 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2593 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2594 return Assert(expression, NULL, 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	2595 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2596 else if (NCH(n) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2597 expr_ty expr1, expr2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2598
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2599 expr1 = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2600 if (!expr1)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2601 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2602 expr2 = ast_for_expr(c, CHILD(n, 3));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2603 if (!expr2)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2604 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2605
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2606 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	2607 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2608 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2609 "improper number of parts to 'assert' statement: %d",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2610 NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2611 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2612 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2613
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2614 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2615 ast_for_suite(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2616 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2617 /* 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	2618 asdl_seq *seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2619 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2620 int i, total, num, end, pos = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2621 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2622
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2623 REQ(n, suite);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2624
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2625 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	2626 seq = asdl_seq_new(total, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2627 if (!seq)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2628 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2629 if (TYPE(CHILD(n, 0)) == simple_stmt) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2630 n = CHILD(n, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2631 /* simple_stmt always ends with a NEWLINE,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2632 and may have a trailing SEMI
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2633 */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2634 end = NCH(n) - 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2635 if (TYPE(CHILD(n, end - 1)) == SEMI)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2636 end--;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2637 /* loop by 2 to skip semi-colons */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2638 for (i = 0; i < end; i += 2) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2639 ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2640 s = ast_for_stmt(c, ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2641 if (!s)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2642 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2643 asdl_seq_SET(seq, pos++, s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2644 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2645 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2646 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2647 for (i = 2; i < (NCH(n) - 1); i++) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2648 ch = CHILD(n, i);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2649 REQ(ch, stmt);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2650 num = num_stmts(ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2651 if (num == 1) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2652 /* small_stmt or compound_stmt with only one child */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2653 s = ast_for_stmt(c, ch);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2654 if (!s)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2655 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2656 asdl_seq_SET(seq, pos++, s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2657 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2658 else {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2659 int j;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2660 ch = CHILD(ch, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2661 REQ(ch, simple_stmt);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2662 for (j = 0; j < NCH(ch); j += 2) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2663 /* statement terminates with a semi-colon ';' */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2664 if (NCH(CHILD(ch, j)) == 0) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2665 assert((j + 1) == NCH(ch));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2666 break;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2667 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2668 s = ast_for_stmt(c, CHILD(ch, j));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2669 if (!s)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2670 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2671 asdl_seq_SET(seq, pos++, s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2672 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2673 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2674 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2675 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2676 assert(pos == seq->size);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2677 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2678 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2679
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2680 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2681 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	2682 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2683 /* if_stmt: 'if' test ':' suite ('elif' test ':' suite)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2684 ['else' ':' suite]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2685 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2686 char *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2687
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2688 REQ(n, if_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2689
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2690 if (NCH(n) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2691 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2692 asdl_seq *suite_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2693
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2694 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2695 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2696 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2697 suite_seq = ast_for_suite(c, CHILD(n, 3));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2698 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2699 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2700
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2701 return If(expression, suite_seq, NULL, 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	2702 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2703
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2704 s = STR(CHILD(n, 4));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2705 /* 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	2706 's' for el_s_e, or
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2707 'i' for el_i_f
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2708 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2709 if (s[2] == 's') {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2710 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2711 asdl_seq seq1, seq2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2712
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2713 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2714 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2715 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2716 seq1 = ast_for_suite(c, CHILD(n, 3));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2717 if (!seq1)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2718 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2719 seq2 = 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	2720 if (!seq2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2721 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2722
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2723 return If(expression, seq1, seq2, 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	2724 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2725 else if (s[2] == 'i') {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2726 int i, n_elif, has_else = 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2727 asdl_seq *orelse = NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2728 n_elif = NCH(n) - 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2729 /* must reference the child n_elif+1 since 'else' token is third,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2730 not fourth, child from the end. */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2731 if (TYPE(CHILD(n, (n_elif + 1))) == NAME
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2732 && STR(CHILD(n, (n_elif + 1)))[2] == 's') {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2733 has_else = 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2734 n_elif -= 3;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2735 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2736 n_elif /= 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2737
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2738 if (has_else) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2739 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2740 asdl_seq seq1, seq2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2741
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2742 orelse = asdl_seq_new(1, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2743 if (!orelse)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2744 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2745 expression = ast_for_expr(c, CHILD(n, NCH(n) - 6));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2746 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2747 return NULL;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2748 seq1 = ast_for_suite(c, CHILD(n, NCH(n) - 4));
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2749 if (!seq1)
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2750 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2751 seq2 = ast_for_suite(c, CHILD(n, NCH(n) - 1));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2752 if (!seq2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2753 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2754
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2755 asdl_seq_SET(orelse, 0, If(expression, seq1, seq2,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2756 LINENO(CHILD(n, NCH(n) - 6)), CHILD(n, NCH(n) - 6)->n_col_offset,
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	2757 c->c_arena));
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2758 /* the just-created orelse handled the last elif */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2759 n_elif--;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2760 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2761
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2762 for (i = 0; i < n_elif; i++) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2763 int off = 5 + (n_elif - i - 1) * 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2764 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2765 asdl_seq *suite_seq;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2766 asdl_seq *newobj = asdl_seq_new(1, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2767 if (!newobj)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2768 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2769 expression = ast_for_expr(c, CHILD(n, off));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2770 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2771 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2772 suite_seq = ast_for_suite(c, CHILD(n, off + 2));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2773 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2774 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2775
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2776 asdl_seq_SET(newobj, 0,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2777 If(expression, suite_seq, orelse,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2778 LINENO(CHILD(n, off)), CHILD(n, off)->n_col_offset, c->c_arena));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2779 orelse = newobj;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2780 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2781 return If(ast_for_expr(c, CHILD(n, 1)),
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2782 ast_for_suite(c, CHILD(n, 3)),
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2783 orelse, 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	2784 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2785
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2786 PyErr_Format(PyExc_SystemError,
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2787 "unexpected token in 'if' statement: %s", s);
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2788 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2789 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2790
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2791 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2792 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	2793 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2794 /* while_stmt: 'while' test ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2795 REQ(n, while_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2796
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2797 if (NCH(n) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2798 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2799 asdl_seq *suite_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2800
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2801 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2802 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2803 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2804 suite_seq = ast_for_suite(c, CHILD(n, 3));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2805 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2806 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2807 return While(expression, suite_seq, NULL, 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	2808 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2809 else if (NCH(n) == 7) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2810 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2811 asdl_seq seq1, seq2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2812
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2813 expression = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2814 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2815 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2816 seq1 = ast_for_suite(c, CHILD(n, 3));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2817 if (!seq1)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2818 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2819 seq2 = 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	2820 if (!seq2)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2821 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2822
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2823 return While(expression, seq1, seq2, 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	2824 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2825
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2826 PyErr_Format(PyExc_SystemError,
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2827 "wrong number of tokens for 'while' statement: %d",
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2828 NCH(n));
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2829 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2830 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2831
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2832 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2833 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	2834 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2835 asdl_seq _target, seq = NULL, *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2836 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2837 expr_ty target;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2838 const node *node_target;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2839 /* for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2840 REQ(n, for_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2841
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2842 if (NCH(n) == 9) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2843 seq = ast_for_suite(c, CHILD(n, 8));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2844 if (!seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2845 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2846 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2847
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2848 node_target = CHILD(n, 1);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2849 _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	2850 if (!_target)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2851 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2852 /* Check the # of children rather than the length of _target, since
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2853 for x, in ... has 1 element in _target, but still requires a Tuple. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2854 if (NCH(node_target) == 1)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2855 target = (expr_ty)asdl_seq_GET(_target, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2856 else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2857 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	2858
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2859 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	2860 if (!expression)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2861 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2862 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	2863 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2864 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2865
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2866 return For(target, expression, suite_seq, seq, LINENO(n), n->n_col_offset,
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2867 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2868 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2869
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2870 static excepthandler_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2871 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	2872 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2873 /* except_clause: 'except' [test [',' test]] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2874 REQ(exc, except_clause);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2875 REQ(body, suite);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2876
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2877 if (NCH(exc) == 1) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2878 asdl_seq *suite_seq = ast_for_suite(c, body);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2879 if (!suite_seq)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2880 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2881
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2882 return excepthandler(NULL, NULL, suite_seq, LINENO(exc),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2883 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2884 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2885 else if (NCH(exc) == 2) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2886 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2887 asdl_seq *suite_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2888
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2889 expression = ast_for_expr(c, CHILD(exc, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2890 if (!expression)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2891 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2892 suite_seq = ast_for_suite(c, body);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2893 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2894 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2895
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2896 return excepthandler(expression, NULL, suite_seq, LINENO(exc),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2897 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2898 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2899 else if (NCH(exc) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2900 asdl_seq *suite_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2901 expr_ty expression;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2902 expr_ty e = ast_for_expr(c, CHILD(exc, 3));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2903 if (!e)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2904 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2905 if (!set_context(e, Store, CHILD(exc, 3)))
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2906 return NULL;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2907 expression = ast_for_expr(c, CHILD(exc, 1));
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2908 if (!expression)
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2909 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2910 suite_seq = ast_for_suite(c, body);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2911 if (!suite_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2912 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2913
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2914 return excepthandler(expression, e, suite_seq, LINENO(exc),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2915 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2916 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2917
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2918 PyErr_Format(PyExc_SystemError,
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2919 "wrong number of children for 'except' clause: %d",
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2920 NCH(exc));
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2921 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2922 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2923
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2924 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2925 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	2926 {
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2927 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	2928 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	2929 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	2930
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2931 REQ(n, try_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2932
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2933 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	2934 if (body == NULL)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2935 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2936
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2937 if (TYPE(CHILD(n, nch - 3)) == NAME) {
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2938 if (strcmp(STR(CHILD(n, nch - 3)), "finally") == 0) {
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2939 if (nch >= 9 && TYPE(CHILD(n, nch - 6)) == NAME) {
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2940 /* we can assume it's an "else",
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2941 because nch >= 9 for try-else-finally and
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2942 it would otherwise have a type of except_clause */
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2943 orelse = ast_for_suite(c, CHILD(n, nch - 4));
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2944 if (orelse == NULL)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2945 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2946 n_except--;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2947 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2948
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2949 finally = ast_for_suite(c, CHILD(n, nch - 1));
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2950 if (finally == NULL)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2951 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2952 n_except--;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2953 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2954 else {
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2955 /* we can assume it's an "else",
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2956 otherwise it would have a type of except_clause */
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2957 orelse = ast_for_suite(c, CHILD(n, nch - 1));
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2958 if (orelse == NULL)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2959 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2960 n_except--;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2961 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2962 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2963 else if (TYPE(CHILD(n, nch - 3)) != except_clause) {
35867 f4842f42700b remove useless debug print helper. fix a couple of exceptions Neal Norwitz <nnorwitz@gmail.com> parents: 35799 diff changeset	2964 ast_error(n, "malformed 'try' statement");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2965 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2966 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2967
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2968 if (n_except > 0) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2969 int i;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2970 stmt_ty 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	2971 /* process except statements to create a try ... except */
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2972 asdl_seq *handlers = asdl_seq_new(n_except, c->c_arena);
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2973 if (handlers == NULL)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2974 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2975
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2976 for (i = 0; i < n_except; i++) {
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2977 excepthandler_ty e = ast_for_except_clause(c, CHILD(n, 3 + i * 3),
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2978 CHILD(n, 5 + i * 3));
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2979 if (!e)
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2980 return NULL;
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2981 asdl_seq_SET(handlers, i, e);
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2982 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2983
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2984 except_st = TryExcept(body, handlers, orelse, LINENO(n),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	2985 n->n_col_offset, c->c_arena);
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2986 if (!finally)
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2987 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	2988
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2989 /* if a 'finally' is present too, we nest the TryExcept within a
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2990 TryFinally to emulate try ... except ... finally */
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2991 body = asdl_seq_new(1, c->c_arena);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2992 if (body == NULL)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2993 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	2994 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	2995 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2996
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2997 /* 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	2998 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	2999 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	3000 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3001
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3002 static expr_ty
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3003 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	3004 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3005 REQ(n, with_var);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3006 return ast_for_expr(c, CHILD(n, 1));
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3007 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3008
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3009 /* with_stmt: 'with' test [ with_var ] ':' suite */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3010 static stmt_ty
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3011 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	3012 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3013 expr_ty context_expr, optional_vars = NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3014 int suite_index = 3; /* skip 'with', test, and ':' */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3015 asdl_seq *suite_seq;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3016
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3017 assert(TYPE(n) == with_stmt);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3018 context_expr = ast_for_expr(c, CHILD(n, 1));
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3019 if (TYPE(CHILD(n, 2)) == with_var) {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3020 optional_vars = ast_for_with_var(c, CHILD(n, 2));
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3021
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3022 if (!optional_vars) {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3023 return NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3024 }
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3025 if (!set_context(optional_vars, Store, n)) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3026 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3027 }
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3028 suite_index = 4;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3029 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3030
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3031 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	3032 if (!suite_seq) {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3033 return NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3034 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	3035 return With(context_expr, optional_vars, suite_seq, LINENO(n),
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3036 n->n_col_offset, c->c_arena);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3037 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3038
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3039 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3040 ast_for_classdef(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3041 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3042 /* classdef: 'class' NAME ['(' testlist ')'] ':' suite */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3043 asdl_seq bases, s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3044
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3045 REQ(n, classdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3046
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3047 if (!strcmp(STR(CHILD(n, 1)), "None")) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3048 ast_error(n, "assignment to None");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3049 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3050 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3051
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3052 if (NCH(n) == 4) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3053 s = ast_for_suite(c, CHILD(n, 3));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3054 if (!s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3055 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3056 return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), NULL, s, LINENO(n),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	3057 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3058 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3059 /* check for empty base list */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3060 if (TYPE(CHILD(n,3)) == RPAR) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3061 s = ast_for_suite(c, CHILD(n,5));
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3062 if (!s)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3063 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3064 return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), NULL, s, LINENO(n),
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	3065 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3066 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3067
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3068 /* 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	3069 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	3070 if (!bases)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3071 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3072
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3073 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	3074 if (!s)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3075 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	3076 return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), bases, s, LINENO(n),
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	3077 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3078 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3079
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3080 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3081 ast_for_stmt(struct compiling c, const node n)
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 if (TYPE(n) == stmt) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3084 assert(NCH(n) == 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3085 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3086 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3087 if (TYPE(n) == simple_stmt) {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3088 assert(num_stmts(n) == 1);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3089 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3090 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3091 if (TYPE(n) == small_stmt) {
40529 54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	3092 REQ(n, small_stmt);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	3093 n = CHILD(n, 0);
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	3094 /* small_stmt: expr_stmt \| print_stmt \| del_stmt \| pass_stmt
54cd47788811 PEP 3107 - Function Annotations thanks to Tony Lownds Neal Norwitz <nnorwitz@gmail.com> parents: 40450 diff changeset	3095 \| flow_stmt \| import_stmt \| global_stmt \| assert_stmt
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3096 */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3097 switch (TYPE(n)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3098 case expr_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3099 return ast_for_expr_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3100 case print_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3101 return ast_for_print_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3102 case del_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3103 return ast_for_del_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3104 case pass_stmt:
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	3105 return Pass(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	3106 case flow_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3107 return ast_for_flow_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3108 case import_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3109 return ast_for_import_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3110 case global_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3111 return ast_for_global_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3112 case assert_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3113 return ast_for_assert_stmt(c, n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3114 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	3115 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3116 "unhandled small_stmt: TYPE=%d NCH=%d\n",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3117 TYPE(n), NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3118 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3119 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3120 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3121 else {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3122 /* compound_stmt: if_stmt \| while_stmt \| for_stmt \| try_stmt
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3123 \| funcdef \| classdef
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3124 */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3125 node *ch = CHILD(n, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3126 REQ(n, compound_stmt);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3127 switch (TYPE(ch)) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3128 case if_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3129 return ast_for_if_stmt(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3130 case while_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3131 return ast_for_while_stmt(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3132 case for_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3133 return ast_for_for_stmt(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3134 case try_stmt:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3135 return ast_for_try_stmt(c, ch);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3136 case with_stmt:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	3137 return ast_for_with_stmt(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3138 case funcdef:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3139 return ast_for_funcdef(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3140 case classdef:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3141 return ast_for_classdef(c, ch);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3142 default:
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	3143 PyErr_Format(PyExc_SystemError,
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3144 "unhandled small_stmt: TYPE=%d NCH=%d\n",
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3145 TYPE(n), NCH(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3146 return NULL;
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3147 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3148 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3149 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3150
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3151 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3152 parsenumber(const char *s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3153 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3154 const char *end;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3155 long x;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3156 double dx;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3157 #ifndef WITHOUT_COMPLEX
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3158 Py_complex c;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3159 int imflag;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3160 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3161
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3162 errno = 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3163 end = s + strlen(s) - 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3164 #ifndef WITHOUT_COMPLEX
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3165 imflag = end == 'j' \|\| end == 'J';
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3166 #endif
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3167 if (end == 'l' \|\| end == 'L')
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3168 return PyLong_FromString((char )s, (char *)0, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3169 if (s[0] == '0') {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3170 x = (long) PyOS_strtoul((char )s, (char *)&end, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3171 if (x < 0 && errno == 0) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3172 return PyLong_FromString((char *)s,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3173 (char **)0,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3174 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3175 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3176 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3177 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3178 x = PyOS_strtol((char )s, (char *)&end, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3179 if (*end == '\0') {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3180 if (errno != 0)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3181 return PyLong_FromString((char )s, (char *)0, 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3182 return PyInt_FromLong(x);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3183 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3184 /* XXX Huge floats may silently fail */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3185 #ifndef WITHOUT_COMPLEX
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3186 if (imflag) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3187 c.real = 0.;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3188 PyFPE_START_PROTECT("atof", return 0)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3189 c.imag = PyOS_ascii_atof(s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3190 PyFPE_END_PROTECT(c)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3191 return PyComplex_FromCComplex(c);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3192 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3193 else
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3194 #endif
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3195 {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3196 PyFPE_START_PROTECT("atof", return 0)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3197 dx = PyOS_ascii_atof(s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3198 PyFPE_END_PROTECT(dx)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3199 return PyFloat_FromDouble(dx);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3200 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3201 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3202
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3203 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3204 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	3205 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3206 #ifndef Py_USING_UNICODE
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3207 Py_FatalError("decode_utf8 should not be called in this build.");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3208 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3209 #else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3210 PyObject u, v;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3211 char s, t;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3212 t = s = (char )sPtr;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3213 /* while (s < end && s != '\\') s++; / /* inefficient for u".." */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3214 while (s < end && (*s & 0x80)) s++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3215 *sPtr = s;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3216 u = PyUnicode_DecodeUTF8(t, s - t, NULL);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3217 if (u == NULL)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3218 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3219 v = PyUnicode_AsEncodedString(u, encoding, NULL);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3220 Py_DECREF(u);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3221 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3222 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3223 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3224
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3225 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3226 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	3227 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3228 PyObject v, u;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3229 char *buf;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3230 char *p;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3231 const char *end;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3232 if (encoding == NULL) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3233 buf = (char *)s;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3234 u = NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3235 } else if (strcmp(encoding, "iso-8859-1") == 0) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3236 buf = (char *)s;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3237 u = NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3238 } else {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3239 /* "\XX" may become "\u005c\uHHLL" (12 bytes) */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3240 u = PyString_FromStringAndSize((char )NULL, len 4);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3241 if (u == NULL)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3242 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3243 p = buf = PyString_AsString(u);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3244 end = s + len;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3245 while (s < end) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3246 if (*s == '\\') {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3247 p++ = s++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3248 if (*s & 0x80) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3249 strcpy(p, "u005c");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3250 p += 5;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3251 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3252 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3253 if (s & 0x80) { / XXX inefficient */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3254 PyObject *w;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3255 char *r;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3256 Py_ssize_t rn, i;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3257 w = decode_utf8(&s, end, "utf-16-be");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3258 if (w == NULL) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3259 Py_DECREF(u);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3260 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3261 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3262 r = PyString_AsString(w);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3263 rn = PyString_Size(w);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3264 assert(rn % 2 == 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3265 for (i = 0; i < rn; i += 2) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3266 sprintf(p, "\\u%02x%02x",
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3267 r[i + 0] & 0xFF,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3268 r[i + 1] & 0xFF);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3269 p += 6;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3270 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3271 Py_DECREF(w);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3272 } else {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3273 p++ = s++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3274 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3275 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3276 len = p - buf;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3277 s = buf;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3278 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3279 if (rawmode)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3280 v = PyUnicode_DecodeRawUnicodeEscape(s, len, NULL);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3281 else
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3282 v = PyUnicode_DecodeUnicodeEscape(s, len, NULL);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3283 Py_XDECREF(u);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3284 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3285 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3286
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3287 /* 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	3288 * 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	3289 * 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	3290 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3291 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3292 parsestr(const char s, const char encoding)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3293 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3294 size_t len;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3295 int quote = Py_CHARMASK(*s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3296 int rawmode = 0;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3297 int need_encoding;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3298 int unicode = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3299
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3300 if (isalpha(quote) \|\| quote == '_') {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3301 if (quote == 'u' \|\| quote == 'U') {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3302 quote = *++s;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3303 unicode = 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3304 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3305 if (quote == 'r' \|\| quote == 'R') {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3306 quote = *++s;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3307 rawmode = 1;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3308 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3309 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3310 if (quote != '\'' && quote != '\"') {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3311 PyErr_BadInternalCall();
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3312 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3313 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3314 s++;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3315 len = strlen(s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3316 if (len > INT_MAX) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3317 PyErr_SetString(PyExc_OverflowError,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3318 "string to parse is too long");
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3319 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3320 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3321 if (s[--len] != quote) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3322 PyErr_BadInternalCall();
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3323 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3324 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3325 if (len >= 4 && s[0] == quote && s[1] == quote) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3326 s += 2;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3327 len -= 2;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3328 if (s[--len] != quote \|\| s[--len] != quote) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3329 PyErr_BadInternalCall();
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3330 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3331 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3332 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3333 #ifdef Py_USING_UNICODE
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3334 if (unicode \|\| Py_UnicodeFlag) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3335 return decode_unicode(s, len, rawmode, encoding);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3336 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3337 #endif
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3338 need_encoding = (encoding != NULL &&
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3339 strcmp(encoding, "utf-8") != 0 &&
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3340 strcmp(encoding, "iso-8859-1") != 0);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3341 if (rawmode \|\| strchr(s, '\\') == NULL) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3342 if (need_encoding) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3343 #ifndef Py_USING_UNICODE
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3344 /* This should not happen - we never see any other
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3345 encoding. */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3346 Py_FatalError(
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	3347 "cannot deal with encodings in this build.");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3348 #else
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3349 PyObject v, u = PyUnicode_DecodeUTF8(s, len, NULL);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3350 if (u == NULL)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3351 return NULL;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3352 v = PyUnicode_AsEncodedString(u, encoding, NULL);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3353 Py_DECREF(u);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3354 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3355 #endif
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3356 } else {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3357 return PyString_FromStringAndSize(s, len);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3358 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3359 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3360
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3361 return PyString_DecodeEscape(s, len, NULL, unicode,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3362 need_encoding ? encoding : NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3363 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3364
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3365 /* 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	3366 * 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	3367 * pasting the intermediate results together.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3368 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3369 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3370 parsestrplus(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3371 {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3372 PyObject *v;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3373 int i;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3374 REQ(CHILD(n, 0), STRING);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3375 if ((v = parsestr(STR(CHILD(n, 0)), c->c_encoding)) != NULL) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3376 /* String literal concatenation */
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3377 for (i = 1; i < NCH(n); i++) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3378 PyObject *s;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3379 s = parsestr(STR(CHILD(n, i)), c->c_encoding);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3380 if (s == NULL)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3381 goto onError;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3382 if (PyString_Check(v) && PyString_Check(s)) {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3383 PyString_ConcatAndDel(&v, s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3384 if (v == NULL)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3385 goto onError;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3386 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3387 #ifdef Py_USING_UNICODE
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3388 else {
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3389 PyObject *temp = PyUnicode_Concat(v, s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3390 Py_DECREF(s);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3391 Py_DECREF(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3392 v = temp;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3393 if (v == NULL)
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3394 goto onError;
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3395 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3396 #endif
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3397 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3398 }
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3399 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3400
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3401 onError:
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3402 Py_XDECREF(v);
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 40215 diff changeset	3403 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3404 }

Mercurial > cpython-lru_cache-weakref

annotate Python/ast.c @ 40529:54cd47788811