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

annotate Python/ast.c @ 45905:2a01075cd902 legacy-trunk

Issue #2400: Allow relative imports to "import *".

author	Martin v. Löwis <martin@v.loewis.de>
date	Wed, 19 Mar 2008 04:39:13 +0000
parents	ff3e9aeaa692
children	84bb7701efba

rev	line source
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2 * This file includes functions to transform a concrete syntax tree (CST) to
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3 * an abstract syntax tree (AST). The main function is PyAST_FromNode().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	4 *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	5 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6 #include "Python.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7 #include "Python-ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	8 #include "grammar.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	9 #include "node.h"
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	10 #include "pyarena.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	11 #include "ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	12 #include "token.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	13 #include "parsetok.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	14 #include "graminit.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	15
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	16 #include <assert.h>
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	17
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	18 /* Data structure used internally */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	19 struct compiling {
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	20 char c_encoding; / source encoding */
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	21 PyArena c_arena; / arena for allocating memeory */
43997 17479a09ec7c Added filename to compiling struct based on Martin's suggestion. Christian Heimes <christian@cheimes.de> parents: 43985 diff changeset	22 const char c_filename; / filename */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	23 };
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	24
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	25 static asdl_seq seq_for_testlist(struct compiling , const node *);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	26 static expr_ty ast_for_expr(struct compiling , const node );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	27 static stmt_ty ast_for_stmt(struct compiling , const node );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	28 static asdl_seq ast_for_suite(struct compiling , const node *);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	29 static asdl_seq ast_for_exprlist(struct compiling , const node *,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	30 expr_context_ty);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	31 static expr_ty ast_for_testlist(struct compiling , const node );
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	32 static stmt_ty ast_for_classdef(struct compiling , const node , asdl_seq *);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	33 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	34
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	35 /* Note different signature for ast_for_call */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	36 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	37
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	38 static PyObject parsenumber(const char );
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	39 static PyObject parsestr(const char s, const char *encoding);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	40 static PyObject parsestrplus(struct compiling , const node *n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	41
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	42 #ifndef LINENO
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	43 #define LINENO(n) ((n)->n_lineno)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	44 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	45
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	46 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	47 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	48 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	49 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	50 return id;
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
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	53 #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	54
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	55 /* 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	56 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	57 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	58 the filename to everything function.
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 XXX Maybe we should just pass the filename...
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	61 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	62
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	63 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	64 ast_error(const node n, const char errstr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	65 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	66 PyObject *u = Py_BuildValue("zi", errstr, LINENO(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	67 if (!u)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	68 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	69 PyErr_SetObject(PyExc_SyntaxError, u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	70 Py_DECREF(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	71 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	72 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	73
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	74 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	75 ast_error_finish(const char *filename)
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 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	78 long lineno;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	79
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	80 assert(PyErr_Occurred());
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	81 if (!PyErr_ExceptionMatches(PyExc_SyntaxError))
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	82 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	83
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	84 PyErr_Fetch(&type, &value, &tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	85 errstr = PyTuple_GetItem(value, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	86 if (!errstr)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	87 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	88 Py_INCREF(errstr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	89 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	90 if (lineno == -1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	91 Py_DECREF(errstr);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	92 return;
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	93 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	94 Py_DECREF(value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	95
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	96 loc = PyErr_ProgramText(filename, lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	97 if (!loc) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	98 Py_INCREF(Py_None);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	99 loc = Py_None;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	100 }
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36224 diff changeset	101 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	102 Py_DECREF(loc);
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	103 if (!tmp) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	104 Py_DECREF(errstr);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	105 return;
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	106 }
38406 8f7c7aeac3a5 Replace Py_BuildValue("OO") by PyTuple_Pack. Georg Brandl <georg@python.org> parents: 38218 diff changeset	107 value = PyTuple_Pack(2, errstr, tmp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	108 Py_DECREF(errstr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	109 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	110 if (!value)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	111 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	112 PyErr_Restore(type, value, tback);
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	115 /* num_stmts() returns number of contained statements.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	116
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	117 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	118 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	119 grammar:
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 stmt: simple_stmt \| compound_stmt
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	122 simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	123
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	124 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	125 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	126 small_stmt elements is returned.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	127 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	128
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	129 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	130 num_stmts(const node *n)
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 int i, l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	133 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	134
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	135 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	136 case single_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	137 if (TYPE(CHILD(n, 0)) == NEWLINE)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	138 return 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	139 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	140 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	141 case file_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	142 l = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	143 for (i = 0; i < NCH(n); i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	144 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	145 if (TYPE(ch) == stmt)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	146 l += num_stmts(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	147 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	148 return l;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	149 case stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	150 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	151 case compound_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	152 return 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	153 case simple_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	154 return NCH(n) / 2; /* Divide by 2 to remove count of semi-colons */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	155 case suite:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	156 if (NCH(n) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	157 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	158 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	159 l = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	160 for (i = 2; i < (NCH(n) - 1); i++)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	161 l += num_stmts(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	162 return l;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	163 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	164 default: {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	165 char buf[128];
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	166
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	167 sprintf(buf, "Non-statement found: %d %d\n",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	168 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	169 Py_FatalError(buf);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	170 }
35742 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 assert(0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	173 return 0;
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 /* 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	177 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	178
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	179 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	180 PyAST_FromNode(const node n, PyCompilerFlags flags, const char *filename,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	181 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	182 {
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	183 int i, j, k, num;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	184 asdl_seq *stmts = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	185 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	186 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	187 struct compiling c;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	188
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	189 if (flags && flags->cf_flags & PyCF_SOURCE_IS_UTF8) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	190 c.c_encoding = "utf-8";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	191 if (TYPE(n) == encoding_decl) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	192 ast_error(n, "encoding declaration in Unicode string");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	193 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	194 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	195 } else if (TYPE(n) == encoding_decl) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	196 c.c_encoding = STR(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	197 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	198 } else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	199 c.c_encoding = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	200 }
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	201 c.c_arena = arena;
43997 17479a09ec7c Added filename to compiling struct based on Martin's suggestion. Christian Heimes <christian@cheimes.de> parents: 43985 diff changeset	202 c.c_filename = filename;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	203
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	204 k = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	205 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	206 case file_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	207 stmts = asdl_seq_new(num_stmts(n), arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	208 if (!stmts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	209 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	210 for (i = 0; i < NCH(n) - 1; i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	211 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	212 if (TYPE(ch) == NEWLINE)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	213 continue;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	214 REQ(ch, stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	215 num = num_stmts(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	216 if (num == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	217 s = ast_for_stmt(&c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	218 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	219 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	220 asdl_seq_SET(stmts, k++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	221 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	222 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	223 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	224 REQ(ch, simple_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	225 for (j = 0; j < num; j++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	226 s = ast_for_stmt(&c, CHILD(ch, j * 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	227 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	228 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	229 asdl_seq_SET(stmts, k++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	230 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	231 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	232 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	233 return Module(stmts, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	234 case eval_input: {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	235 expr_ty testlist_ast;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	236
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	237 /* XXX Why not gen_for here? */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	238 testlist_ast = ast_for_testlist(&c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	239 if (!testlist_ast)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	240 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	241 return Expression(testlist_ast, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	242 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	243 case single_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	244 if (TYPE(CHILD(n, 0)) == NEWLINE) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	245 stmts = asdl_seq_new(1, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	246 if (!stmts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	247 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	248 asdl_seq_SET(stmts, 0, Pass(n->n_lineno, n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	249 arena));
41579 7a4f174df844 Handle a couple of uncaught errors. This should be backported Neal Norwitz <nnorwitz@gmail.com> parents: 41578 diff changeset	250 if (!asdl_seq_GET(stmts, 0))
7a4f174df844 Handle a couple of uncaught errors. This should be backported Neal Norwitz <nnorwitz@gmail.com> parents: 41578 diff changeset	251 goto error;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	252 return Interactive(stmts, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	253 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	254 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	255 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	256 num = num_stmts(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	257 stmts = asdl_seq_new(num, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	258 if (!stmts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	259 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	260 if (num == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	261 s = ast_for_stmt(&c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	262 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	263 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	264 asdl_seq_SET(stmts, 0, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	265 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	266 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	267 /* Only a simple_stmt can contain multiple statements. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	268 REQ(n, simple_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	269 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	270 if (TYPE(CHILD(n, i)) == NEWLINE)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	271 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	272 s = ast_for_stmt(&c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	273 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	274 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	275 asdl_seq_SET(stmts, i / 2, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	276 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	277 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	278
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	279 return Interactive(stmts, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	280 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	281 default:
41578 bc6a0fe32351 Actually raise an exception before calling ast_error_finish. Georg Brandl <georg@python.org> parents: 41215 diff changeset	282 PyErr_Format(PyExc_SystemError,
bc6a0fe32351 Actually raise an exception before calling ast_error_finish. Georg Brandl <georg@python.org> parents: 41215 diff changeset	283 "invalid node %d for PyAST_FromNode", TYPE(n));
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	284 goto error;
35742 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 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	287 ast_error_finish(filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	288 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	289 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	290
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	291 /* 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	292 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	293
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	294 static operator_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	295 get_operator(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	296 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	297 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	298 case VBAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	299 return BitOr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	300 case CIRCUMFLEX:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	301 return BitXor;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	302 case AMPER:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	303 return BitAnd;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	304 case LEFTSHIFT:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	305 return LShift;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	306 case RIGHTSHIFT:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	307 return RShift;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	308 case PLUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	309 return Add;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	310 case MINUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	311 return Sub;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	312 case STAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	313 return Mult;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	314 case SLASH:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	315 return Div;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	316 case DOUBLESLASH:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	317 return FloorDiv;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	318 case PERCENT:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	319 return Mod;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	320 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	321 return (operator_ty)0;
35742 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
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	325 /* 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	326
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	327 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	328 (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	329 an appropriate syntax error and returns false.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	330 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	331
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	332 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	333 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	334 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	335 asdl_seq *s = NULL;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	336 /* 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	337 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	338 */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	339 const char* expr_name = NULL;
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	340
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	341 /* 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	342 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	343 a little more complex than necessary as a result. It also means
39037 9f70f6ba7b69 Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39034 diff changeset	344 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	345 Consider restructuring so that augmented assignment uses
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	346 set_context(), too.
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	347 */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	348 assert(ctx != AugStore && ctx != AugLoad);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	349
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	350 switch (e->kind) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	351 case Attribute_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	352 if (ctx == Store &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	353 !strcmp(PyString_AS_STRING(e->v.Attribute.attr), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	354 return ast_error(n, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	355 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	356 e->v.Attribute.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	357 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	358 case Subscript_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	359 e->v.Subscript.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	360 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	361 case Name_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	362 if (ctx == Store &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	363 !strcmp(PyString_AS_STRING(e->v.Name.id), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	364 return ast_error(n, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	365 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	366 e->v.Name.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	367 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	368 case List_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	369 e->v.List.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	370 s = e->v.List.elts;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	371 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	372 case Tuple_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	373 if (asdl_seq_LEN(e->v.Tuple.elts) == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	374 return ast_error(n, "can't assign to ()");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	375 e->v.Tuple.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	376 s = e->v.Tuple.elts;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	377 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	378 case Lambda_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	379 expr_name = "lambda";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	380 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	381 case Call_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	382 expr_name = "function call";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	383 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	384 case BoolOp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	385 case BinOp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	386 case UnaryOp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	387 expr_name = "operator";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	388 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	389 case GeneratorExp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	390 expr_name = "generator expression";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	391 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	392 case Yield_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	393 expr_name = "yield expression";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	394 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	395 case ListComp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	396 expr_name = "list comprehension";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	397 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	398 case Dict_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	399 case Num_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	400 case Str_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	401 expr_name = "literal";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	402 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	403 case Compare_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	404 expr_name = "comparison";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	405 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	406 case Repr_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	407 expr_name = "repr";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	408 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	409 case IfExp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	410 expr_name = "conditional expression";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	411 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	412 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	413 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	414 "unexpected expression in assignment %d (line %d)",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	415 e->kind, e->lineno);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	416 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	417 }
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	418 /* Check for error string set by switch */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	419 if (expr_name) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	420 char buf[300];
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	421 PyOS_snprintf(buf, sizeof(buf),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	422 "can't %s %s",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	423 ctx == Store ? "assign to" : "delete",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	424 expr_name);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	425 return ast_error(n, buf);
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	426 }
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	427
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	428 /* If the LHS is a list or tuple, we need to set the assignment
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	429 context for all the contained elements.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	430 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	431 if (s) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	432 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	433
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	434 for (i = 0; i < asdl_seq_LEN(s); i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	435 if (!set_context((expr_ty)asdl_seq_GET(s, i), ctx, n))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	436 return 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	437 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	438 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	439 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	440 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	441
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	442 static operator_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	443 ast_for_augassign(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	444 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	445 REQ(n, augassign);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	446 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	447 switch (STR(n)[0]) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	448 case '+':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	449 return Add;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	450 case '-':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	451 return Sub;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	452 case '/':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	453 if (STR(n)[1] == '/')
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	454 return FloorDiv;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	455 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	456 return Div;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	457 case '%':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	458 return Mod;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	459 case '<':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	460 return LShift;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	461 case '>':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	462 return RShift;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	463 case '&':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	464 return BitAnd;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	465 case '^':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	466 return BitXor;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	467 case '\|':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	468 return BitOr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	469 case '*':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	470 if (STR(n)[1] == '*')
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	471 return Pow;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	472 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	473 return Mult;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	474 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	475 PyErr_Format(PyExc_SystemError, "invalid augassign: %s", STR(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	476 return (operator_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	477 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	478 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	479
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	480 static cmpop_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	481 ast_for_comp_op(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	482 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	483 /* comp_op: '<'\|'>'\|'=='\|'>='\|'<='\|'<>'\|'!='\|'in'\|'not' 'in'\|'is'
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	484 \|'is' 'not'
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	485 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	486 REQ(n, comp_op);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	487 if (NCH(n) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	488 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	489 switch (TYPE(n)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	490 case LESS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	491 return Lt;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	492 case GREATER:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	493 return Gt;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	494 case EQEQUAL: /* == */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	495 return Eq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	496 case LESSEQUAL:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	497 return LtE;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	498 case GREATEREQUAL:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	499 return GtE;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	500 case NOTEQUAL:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	501 return NotEq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	502 case NAME:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	503 if (strcmp(STR(n), "in") == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	504 return In;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	505 if (strcmp(STR(n), "is") == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	506 return Is;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	507 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	508 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	509 STR(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	510 return (cmpop_ty)0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	511 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	512 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	513 else if (NCH(n) == 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	514 /* handle "not in" and "is not" */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	515 switch (TYPE(CHILD(n, 0))) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	516 case NAME:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	517 if (strcmp(STR(CHILD(n, 1)), "in") == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	518 return NotIn;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	519 if (strcmp(STR(CHILD(n, 0)), "is") == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	520 return IsNot;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	521 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	522 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s %s",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	523 STR(CHILD(n, 0)), STR(CHILD(n, 1)));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	524 return (cmpop_ty)0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	525 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	526 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	527 PyErr_Format(PyExc_SystemError, "invalid comp_op: has %d children",
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	528 NCH(n));
37604 c732f66c913f Convert 0 to their respective enum types. Convert Martin v. Löwis <martin@v.loewis.de> parents: 37597 diff changeset	529 return (cmpop_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	530 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	531
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	532 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	533 seq_for_testlist(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	534 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	535 /* testlist: test (',' test)* [','] */
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	536 asdl_seq *seq;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	537 expr_ty expression;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	538 int i;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	539 assert(TYPE(n) == testlist \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	540 TYPE(n) == listmaker \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	541 TYPE(n) == testlist_gexp \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	542 TYPE(n) == testlist_safe \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	543 TYPE(n) == testlist1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	544
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	545 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	546 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	547 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	548
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	549 for (i = 0; i < NCH(n); i += 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	550 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	551
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	552 expression = ast_for_expr(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	553 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	554 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	555
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	556 assert(i / 2 < seq->size);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	557 asdl_seq_SET(seq, i / 2, expression);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	558 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	559 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	560 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	561
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	562 static expr_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	563 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	564 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	565 int i, len = (NCH(n) + 1) / 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	566 expr_ty result;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	567 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	568 if (!args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	569 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	570
39872 b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). Neal Norwitz <nnorwitz@gmail.com> parents: 39779 diff changeset	571 /* fpdef: NAME \| '(' fplist ')'
b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). Neal Norwitz <nnorwitz@gmail.com> parents: 39779 diff changeset	572 fplist: fpdef (',' fpdef)* [',']
b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). Neal Norwitz <nnorwitz@gmail.com> parents: 39779 diff changeset	573 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	574 REQ(n, fplist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	575 for (i = 0; i < len; i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	576 const node fpdef_node = CHILD(n, 2i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	577 const node *child;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	578 expr_ty arg;
39872 b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). Neal Norwitz <nnorwitz@gmail.com> parents: 39779 diff changeset	579 set_name:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	580 /* fpdef_node is either a NAME or an fplist */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	581 child = CHILD(fpdef_node, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	582 if (TYPE(child) == NAME) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	583 if (!strcmp(STR(child), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	584 ast_error(child, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	585 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	586 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	587 arg = Name(NEW_IDENTIFIER(child), Store, LINENO(child),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	588 child->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	589 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	590 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	591 assert(TYPE(fpdef_node) == fpdef);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	592 /* fpdef_node[0] is not a name, so it must be '(', get CHILD[1] */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	593 child = CHILD(fpdef_node, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	594 assert(TYPE(child) == fplist);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	595 /* NCH == 1 means we have (x), we need to elide the extra parens */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	596 if (NCH(child) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	597 fpdef_node = CHILD(child, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	598 assert(TYPE(fpdef_node) == fpdef);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	599 goto set_name;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	600 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	601 arg = compiler_complex_args(c, child);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	602 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	603 asdl_seq_SET(args, i, arg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	604 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	605
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	606 result = Tuple(args, Store, LINENO(n), n->n_col_offset, c->c_arena);
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	607 if (!set_context(result, Store, n))
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	608 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	609 return result;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	610 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	611
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	612
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	613 /* Create AST for argument list. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	614
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	615 static arguments_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	616 ast_for_arguments(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	617 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	618 /* parameters: '(' [varargslist] ')'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	619 varargslist: (fpdef ['=' test] ',')* ('' NAME [',' '*' NAME]
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	620 \| '*' NAME) \| fpdef ['=' test] (',' fpdef ['=' test]) [',']
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	621 */
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	622 int i, j, k, n_args = 0, n_defaults = 0, found_default = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	623 asdl_seq args, defaults;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	624 identifier vararg = NULL, kwarg = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	625 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	626
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	627 if (TYPE(n) == parameters) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	628 if (NCH(n) == 2) /* () as argument list */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	629 return arguments(NULL, NULL, NULL, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	630 n = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	631 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	632 REQ(n, varargslist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	633
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	634 /* first count the number of normal args & defaults */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	635 for (i = 0; i < NCH(n); i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	636 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	637 if (TYPE(ch) == fpdef)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	638 n_args++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	639 if (TYPE(ch) == EQUAL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	640 n_defaults++;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	641 }
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	642 args = (n_args ? asdl_seq_new(n_args, c->c_arena) : NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	643 if (!args && n_args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	644 return NULL; /* Don't need to goto error; no objects allocated */
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	645 defaults = (n_defaults ? asdl_seq_new(n_defaults, c->c_arena) : NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	646 if (!defaults && n_defaults)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	647 return NULL; /* Don't need to goto error; no objects allocated */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	648
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	649 /* fpdef: NAME \| '(' fplist ')'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	650 fplist: fpdef (',' fpdef)* [',']
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	651 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	652 i = 0;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	653 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	654 k = 0; /* index for args */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	655 while (i < NCH(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	656 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	657 switch (TYPE(ch)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	658 case fpdef:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	659 handle_fpdef:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	660 /* XXX Need to worry about checking if TYPE(CHILD(n, i+1)) is
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	661 anything other than EQUAL or a comma? */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	662 /* XXX Should NCH(n) check be made a separate check? */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	663 if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	664 expr_ty expression = ast_for_expr(c, CHILD(n, i + 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	665 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	666 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	667 assert(defaults != NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	668 asdl_seq_SET(defaults, j++, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	669 i += 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	670 found_default = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	671 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	672 else if (found_default) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	673 ast_error(n,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	674 "non-default argument follows default argument");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	675 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	676 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	677 if (NCH(ch) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	678 ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	679 /* def foo((x)): is not complex, special case. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	680 if (NCH(ch) != 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	681 /* We have complex arguments, setup for unpacking. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	682 asdl_seq_SET(args, k++, compiler_complex_args(c, ch));
41579 7a4f174df844 Handle a couple of uncaught errors. This should be backported Neal Norwitz <nnorwitz@gmail.com> parents: 41578 diff changeset	683 if (!asdl_seq_GET(args, k-1))
7a4f174df844 Handle a couple of uncaught errors. This should be backported Neal Norwitz <nnorwitz@gmail.com> parents: 41578 diff changeset	684 goto error;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	685 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	686 /* def foo((x)): setup for checking NAME below. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	687 /* Loop because there can be many parens and tuple
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	688 unpacking mixed in. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	689 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	690 assert(TYPE(ch) == fpdef);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	691 goto handle_fpdef;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	692 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	693 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	694 if (TYPE(CHILD(ch, 0)) == NAME) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	695 expr_ty name;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	696 if (!strcmp(STR(CHILD(ch, 0)), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	697 ast_error(CHILD(ch, 0), "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	698 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	699 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	700 name = Name(NEW_IDENTIFIER(CHILD(ch, 0)),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	701 Param, LINENO(ch), ch->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	702 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	703 if (!name)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	704 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	705 asdl_seq_SET(args, k++, name);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	706
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	707 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	708 i += 2; /* the name and the comma */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	709 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	710 case STAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	711 if (!strcmp(STR(CHILD(n, i+1)), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	712 ast_error(CHILD(n, i+1), "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	713 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	714 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	715 vararg = NEW_IDENTIFIER(CHILD(n, i+1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	716 i += 3;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	717 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	718 case DOUBLESTAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	719 if (!strcmp(STR(CHILD(n, i+1)), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	720 ast_error(CHILD(n, i+1), "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	721 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	722 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	723 kwarg = NEW_IDENTIFIER(CHILD(n, i+1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	724 i += 3;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	725 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	726 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	727 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	728 "unexpected node in varargslist: %d @ %d",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	729 TYPE(ch), i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	730 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	731 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	732 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	733
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	734 return arguments(args, vararg, kwarg, defaults, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	735
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	736 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	737 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	738 Py_XDECREF(kwarg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	739 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	740 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	741
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	742 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	743 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	744 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	745 expr_ty e;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	746 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	747 int lineno, col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	748 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	749
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	750 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	751
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	752 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	753 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	754
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	755 id = NEW_IDENTIFIER(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	756 if (!id)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	757 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	758 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	759 if (!e)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	760 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	761
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	762 for (i = 2; i < NCH(n); i+=2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	763 id = NEW_IDENTIFIER(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	764 if (!id)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	765 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	766 e = Attribute(e, id, Load, lineno, col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	767 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	768 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	769 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	770
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	771 return e;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	772 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	773
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	774 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	775 ast_for_decorator(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	776 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	777 /* decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	778 expr_ty d = NULL;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	779 expr_ty name_expr;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	780
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	781 REQ(n, decorator);
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	782 REQ(CHILD(n, 0), AT);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	783 REQ(RCHILD(n, -1), NEWLINE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	784
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	785 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	786 if (!name_expr)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	787 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	788
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	789 if (NCH(n) == 3) { /* No arguments */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	790 d = name_expr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	791 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	792 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	793 else if (NCH(n) == 5) { /* Call with no arguments */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	794 d = Call(name_expr, NULL, NULL, NULL, NULL, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	795 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	796 if (!d)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	797 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	798 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	799 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	800 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	801 d = ast_for_call(c, CHILD(n, 3), name_expr);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	802 if (!d)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	803 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	804 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	805 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	806
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	807 return d;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	808 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	809
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	810 static asdl_seq*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	811 ast_for_decorators(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	812 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	813 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	814 expr_ty d;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	815 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	816
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	817 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	818 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	819 if (!decorator_seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	820 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	821
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	822 for (i = 0; i < NCH(n); i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	823 d = ast_for_decorator(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	824 if (!d)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	825 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	826 asdl_seq_SET(decorator_seq, i, d);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	827 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	828 return decorator_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	829 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	830
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	831 static stmt_ty
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	832 ast_for_funcdef(struct compiling c, const node n, asdl_seq *decorator_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	833 {
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	834 /* funcdef: 'def' NAME parameters ':' suite */
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	835 identifier name;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	836 arguments_ty args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	837 asdl_seq *body;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	838 int name_i = 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	839
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	840 REQ(n, funcdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	841
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	842 name = NEW_IDENTIFIER(CHILD(n, name_i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	843 if (!name)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	844 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	845 else if (!strcmp(STR(CHILD(n, name_i)), "None")) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	846 ast_error(CHILD(n, name_i), "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	847 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	848 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	849 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	850 if (!args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	851 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	852 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	853 if (!body)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	854 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	855
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37235 diff changeset	856 return FunctionDef(name, args, body, decorator_seq, LINENO(n),
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	857 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	858 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	859
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	860 static stmt_ty
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	861 ast_for_decorated(struct compiling c, const node n)
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	862 {
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	863 /* decorated: decorators (classdef \| funcdef) */
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	864 stmt_ty thing = NULL;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	865 asdl_seq *decorator_seq = NULL;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	866
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	867 REQ(n, decorated);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	868
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	869 decorator_seq = ast_for_decorators(c, CHILD(n, 0));
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	870 if (!decorator_seq)
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	871 return NULL;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	872
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	873 assert(TYPE(CHILD(n, 1)) == funcdef \|\|
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	874 TYPE(CHILD(n, 1)) == classdef);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	875
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	876 if (TYPE(CHILD(n, 1)) == funcdef) {
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	877 thing = ast_for_funcdef(c, CHILD(n, 1), decorator_seq);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	878 } else if (TYPE(CHILD(n, 1)) == classdef) {
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	879 thing = ast_for_classdef(c, CHILD(n, 1), decorator_seq);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	880 }
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	881 /* we count the decorators in when talking about the class' or
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	882 function's line number */
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	883 if (thing) {
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	884 thing->lineno = LINENO(n);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	885 thing->col_offset = n->n_col_offset;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	886 }
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	887 return thing;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	888 }
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	889
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	890 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	891 ast_for_lambdef(struct compiling c, const node n)
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 /* lambdef: 'lambda' [varargslist] ':' test */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	894 arguments_ty args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	895 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	896
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	897 if (NCH(n) == 3) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	898 args = arguments(NULL, NULL, NULL, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	899 if (!args)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	900 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	901 expression = ast_for_expr(c, CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	902 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 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 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	906 args = ast_for_arguments(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	907 if (!args)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	908 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	909 expression = ast_for_expr(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	910 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 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
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	914 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	915 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	916
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	917 static expr_ty
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	918 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	919 {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	920 /* 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	921 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	922
36676 67c74efad8c2 Fix old not-reading-pep-308-right artifact. Thomas Wouters <thomas@python.org> parents: 36670 diff changeset	923 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	924 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	925 if (!body)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	926 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	927 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	928 if (!expression)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	929 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	930 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	931 if (!orelse)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	932 return NULL;
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37235 diff changeset	933 return IfExp(expression, body, orelse, LINENO(n), n->n_col_offset,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	934 c->c_arena);
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	935 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	936
39755 c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. Neal Norwitz <nnorwitz@gmail.com> parents: 39753 diff changeset	937 /* XXX(nnorwitz): the listcomp and genexpr code should be refactored
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. Neal Norwitz <nnorwitz@gmail.com> parents: 39753 diff changeset	938 so there is only a single version. Possibly for loops can also re-use
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. Neal Norwitz <nnorwitz@gmail.com> parents: 39753 diff changeset	939 the code.
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. Neal Norwitz <nnorwitz@gmail.com> parents: 39753 diff changeset	940 */
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. Neal Norwitz <nnorwitz@gmail.com> parents: 39753 diff changeset	941
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	942 /* 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	943
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	944 Helper for ast_for_listcomp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	945 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	946
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	947 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	948 count_list_fors(const node *n)
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 int n_fors = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	951 node *ch = CHILD(n, 1);
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 count_list_for:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	954 n_fors++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	955 REQ(ch, list_for);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	956 if (NCH(ch) == 5)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	957 ch = CHILD(ch, 4);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	958 else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	959 return n_fors;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	960 count_list_iter:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	961 REQ(ch, list_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	962 ch = CHILD(ch, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	963 if (TYPE(ch) == list_for)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	964 goto count_list_for;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	965 else if (TYPE(ch) == list_if) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	966 if (NCH(ch) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	967 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	968 goto count_list_iter;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	969 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	970 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	971 return n_fors;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	972 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	973
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	974 /* Should never be reached */
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	975 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	976 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	977 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	978
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	979 /* 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	980
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	981 Helper for ast_for_listcomp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	982 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	983
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	984 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	985 count_list_ifs(const node *n)
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 int n_ifs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	988
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	989 count_list_iter:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	990 REQ(n, list_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	991 if (TYPE(CHILD(n, 0)) == list_for)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	992 return n_ifs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	993 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	994 REQ(n, list_if);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	995 n_ifs++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	996 if (NCH(n) == 2)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	997 return n_ifs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	998 n = CHILD(n, 2);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	999 goto count_list_iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1000 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1001
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1002 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1003 ast_for_listcomp(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1004 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1005 /* listmaker: test ( list_for \| (',' test)* [','] )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1006 list_for: 'for' exprlist 'in' testlist_safe [list_iter]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1007 list_iter: list_for \| list_if
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1008 list_if: 'if' test [list_iter]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1009 testlist_safe: test [(',' test)+ [',']]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1010 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1011 expr_ty elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1012 asdl_seq *listcomps;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1013 int i, n_fors;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1014 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1015
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1016 REQ(n, listmaker);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1017 assert(NCH(n) > 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1018
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1019 elt = ast_for_expr(c, CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1020 if (!elt)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1021 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1022
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1023 n_fors = count_list_fors(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1024 if (n_fors == -1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1025 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1026
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	1027 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	1028 if (!listcomps)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1029 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	1030
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1031 ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1032 for (i = 0; i < n_fors; i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1033 comprehension_ty lc;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1034 asdl_seq *t;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1035 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1036 node *for_ch;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1037
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1038 REQ(ch, list_for);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1039
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1040 for_ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1041 t = ast_for_exprlist(c, for_ch, Store);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1042 if (!t)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1043 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1044 expression = ast_for_testlist(c, CHILD(ch, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1045 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1046 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1047
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1048 /* Check the # of children rather than the length of t, since
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1049 [x for x, in ... ] has 1 element in t, but still requires a Tuple.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1050 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1051 if (NCH(for_ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1052 lc = comprehension((expr_ty)asdl_seq_GET(t, 0), expression, NULL,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1053 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1054 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1055 lc = comprehension(Tuple(t, Store, LINENO(ch), ch->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1056 c->c_arena),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1057 expression, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1058 if (!lc)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1059 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1060
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1061 if (NCH(ch) == 5) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1062 int j, n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1063 asdl_seq *ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1064 expr_ty list_for_expr;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1065
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1066 ch = CHILD(ch, 4);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1067 n_ifs = count_list_ifs(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1068 if (n_ifs == -1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1069 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1070
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1071 ifs = asdl_seq_new(n_ifs, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1072 if (!ifs)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1073 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1074
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1075 for (j = 0; j < n_ifs; j++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1076 REQ(ch, list_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1077 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1078 REQ(ch, list_if);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1079
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1080 list_for_expr = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1081 if (!list_for_expr)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1082 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1083
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1084 asdl_seq_SET(ifs, j, list_for_expr);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1085 if (NCH(ch) == 3)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1086 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1087 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1088 /* on exit, must guarantee that ch is a list_for */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1089 if (TYPE(ch) == list_iter)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1090 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1091 lc->ifs = ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1092 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1093 asdl_seq_SET(listcomps, i, lc);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1094 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1095
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1096 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	1097 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1098
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1099 /* Count the number of 'for' loops in a generator expression.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1100
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1101 Helper for ast_for_genexp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1102 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1103
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1104 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1105 count_gen_fors(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1106 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1107 int n_fors = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1108 node *ch = CHILD(n, 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 count_gen_for:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1111 n_fors++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1112 REQ(ch, gen_for);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1113 if (NCH(ch) == 5)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1114 ch = CHILD(ch, 4);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1115 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1116 return n_fors;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1117 count_gen_iter:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1118 REQ(ch, gen_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1119 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1120 if (TYPE(ch) == gen_for)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1121 goto count_gen_for;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1122 else if (TYPE(ch) == gen_if) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1123 if (NCH(ch) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1124 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1125 goto count_gen_iter;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1126 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1127 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1128 return n_fors;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1129 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1130
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1131 /* Should never be reached */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1132 PyErr_SetString(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1133 "logic error in count_gen_fors");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1134 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1135 }
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 /* 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	1138
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1139 Helper for ast_for_genexp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1140 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1141
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1142 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1143 count_gen_ifs(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1144 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1145 int n_ifs = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1146
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1147 while (1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1148 REQ(n, gen_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1149 if (TYPE(CHILD(n, 0)) == gen_for)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1150 return n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1151 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1152 REQ(n, gen_if);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1153 n_ifs++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1154 if (NCH(n) == 2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1155 return n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1156 n = CHILD(n, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1157 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1158 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1159
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1160 /* TODO(jhylton): Combine with list comprehension code? */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1161 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1162 ast_for_genexp(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1163 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1164 /* testlist_gexp: test ( gen_for \| (',' test)* [','] )
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1165 argument: [test '='] test [gen_for] # Really [keyword '='] test */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1166 expr_ty elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1167 asdl_seq *genexps;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1168 int i, n_fors;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1169 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1170
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1171 assert(TYPE(n) == (testlist_gexp) \|\| TYPE(n) == (argument));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1172 assert(NCH(n) > 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1173
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1174 elt = ast_for_expr(c, CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1175 if (!elt)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1176 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1177
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1178 n_fors = count_gen_fors(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1179 if (n_fors == -1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1180 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	1181
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1182 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	1183 if (!genexps)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1184 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	1185
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1186 ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1187 for (i = 0; i < n_fors; i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1188 comprehension_ty ge;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1189 asdl_seq *t;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1190 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1191 node *for_ch;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1192
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1193 REQ(ch, gen_for);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1194
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1195 for_ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1196 t = ast_for_exprlist(c, for_ch, Store);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1197 if (!t)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1198 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1199 expression = ast_for_expr(c, CHILD(ch, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1200 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1201 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	1202
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1203 /* Check the # of children rather than the length of t, since
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1204 (x for x, in ...) has 1 element in t, but still requires a Tuple. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1205 if (NCH(for_ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1206 ge = comprehension((expr_ty)asdl_seq_GET(t, 0), expression,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1207 NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1208 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1209 ge = comprehension(Tuple(t, Store, LINENO(ch), ch->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1210 c->c_arena),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1211 expression, NULL, c->c_arena);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1212
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1213 if (!ge)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1214 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	1215
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1216 if (NCH(ch) == 5) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1217 int j, n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1218 asdl_seq *ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1219
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1220 ch = CHILD(ch, 4);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1221 n_ifs = count_gen_ifs(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1222 if (n_ifs == -1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1223 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	1224
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1225 ifs = asdl_seq_new(n_ifs, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1226 if (!ifs)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1227 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	1228
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1229 for (j = 0; j < n_ifs; j++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1230 REQ(ch, gen_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1231 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1232 REQ(ch, gen_if);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1233
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1234 expression = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1235 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1236 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1237 asdl_seq_SET(ifs, j, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1238 if (NCH(ch) == 3)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1239 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1240 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1241 /* on exit, must guarantee that ch is a gen_for */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1242 if (TYPE(ch) == gen_iter)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1243 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1244 ge->ifs = ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1245 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1246 asdl_seq_SET(genexps, i, ge);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1247 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1248
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1249 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	1250 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1251
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1252 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1253 ast_for_atom(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1254 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1255 /* atom: '(' [yield_expr\|testlist_gexp] ')' \| '[' [listmaker] ']'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1256 \| '{' [dictmaker] '}' \| '`' testlist '`' \| NAME \| NUMBER \| STRING+
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1257 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1258 node *ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1259
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1260 switch (TYPE(ch)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1261 case NAME:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1262 /* All names start in Load context, but may later be
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1263 changed. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1264 return Name(NEW_IDENTIFIER(ch), Load, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1265 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1266 case STRING: {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1267 PyObject *str = parsestrplus(c, n);
42308 6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1268 if (!str) {
44572 db5e01c33eb7 Make Python compile with --disable-unicode. Georg Brandl <georg@python.org> parents: 43997 diff changeset	1269 #ifdef Py_USING_UNICODE
42308 6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1270 if (PyErr_ExceptionMatches(PyExc_UnicodeError)){
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1271 PyObject type, value, tback, errstr;
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1272 PyErr_Fetch(&type, &value, &tback);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1273 errstr = ((PyUnicodeErrorObject *)value)->reason;
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1274 if (errstr) {
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1275 char *s = "";
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1276 char buf[128];
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1277 s = PyString_AsString(errstr);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1278 PyOS_snprintf(buf, sizeof(buf), "(unicode error) %s", s);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1279 ast_error(n, buf);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1280 } else {
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1281 ast_error(n, "(unicode error) unknown error");
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1282 }
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1283 Py_DECREF(type);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1284 Py_DECREF(value);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1285 Py_XDECREF(tback);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1286 }
44572 db5e01c33eb7 Make Python compile with --disable-unicode. Georg Brandl <georg@python.org> parents: 43997 diff changeset	1287 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1288 return NULL;
42308 6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1289 }
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1290 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1291 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	1292 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1293 case NUMBER: {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1294 PyObject *pynum = parsenumber(STR(ch));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1295 if (!pynum)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1296 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	1297
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1298 PyArena_AddPyObject(c->c_arena, pynum);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1299 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	1300 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1301 case LPAR: /* some parenthesized expressions */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1302 ch = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1303
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1304 if (TYPE(ch) == RPAR)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1305 return Tuple(NULL, Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1306
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1307 if (TYPE(ch) == yield_expr)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1308 return ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1309
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1310 if ((NCH(ch) > 1) && (TYPE(CHILD(ch, 1)) == gen_for))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1311 return ast_for_genexp(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1312
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1313 return ast_for_testlist_gexp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1314 case LSQB: /* list (or list comprehension) */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1315 ch = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1316
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1317 if (TYPE(ch) == RSQB)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1318 return List(NULL, Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1319
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1320 REQ(ch, listmaker);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1321 if (NCH(ch) == 1 \|\| TYPE(CHILD(ch, 1)) == COMMA) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1322 asdl_seq *elts = seq_for_testlist(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1323 if (!elts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1324 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	1325
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1326 return List(elts, Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1327 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1328 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1329 return ast_for_listcomp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1330 case LBRACE: {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1331 /* dictmaker: test ':' test (',' test ':' test)* [','] */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1332 int i, size;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1333 asdl_seq keys, values;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1334
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1335 ch = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1336 size = (NCH(ch) + 1) / 4; /* +1 in case no trailing comma */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1337 keys = asdl_seq_new(size, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1338 if (!keys)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1339 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1340
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1341 values = asdl_seq_new(size, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1342 if (!values)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1343 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1344
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1345 for (i = 0; i < NCH(ch); i += 4) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1346 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1347
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1348 expression = ast_for_expr(c, CHILD(ch, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1349 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 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
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1352 asdl_seq_SET(keys, i / 4, expression);
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1353
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1354 expression = ast_for_expr(c, CHILD(ch, i + 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1355 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1356 return NULL;
35873 76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too) Neal Norwitz <nnorwitz@gmail.com> parents: 35870 diff changeset	1357
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1358 asdl_seq_SET(values, i / 4, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1359 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1360 return Dict(keys, values, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1361 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1362 case BACKQUOTE: { /* repr */
43985 2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1363 expr_ty expression;
43983 e725166c8c81 Fixed problems in the last commit. Filenames and line numbers weren't reported correctly. Christian Heimes <christian@cheimes.de> parents: 43982 diff changeset	1364 if (Py_Py3kWarningFlag) {
43985 2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1365 if (PyErr_WarnExplicit(PyExc_DeprecationWarning,
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1366 "backquote not supported in 3.x",
43997 17479a09ec7c Added filename to compiling struct based on Martin's suggestion. Christian Heimes <christian@cheimes.de> parents: 43985 diff changeset	1367 c->c_filename, LINENO(n),
43985 2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1368 NULL, NULL)) {
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1369 return NULL;
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1370 }
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1371 }
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block. Christian Heimes <christian@cheimes.de> parents: 43984 diff changeset	1372 expression = ast_for_testlist(c, CHILD(n, 1));
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1373 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1374 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	1375
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1376 return Repr(expression, LINENO(n), n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1377 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1378 default:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1379 PyErr_Format(PyExc_SystemError, "unhandled atom %d", TYPE(ch));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1380 return NULL;
35742 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 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1383
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1384 static slice_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1385 ast_for_slice(struct compiling c, const node n)
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 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1388 expr_ty lower = NULL, upper = NULL, step = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1389
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1390 REQ(n, subscript);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1391
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1392 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1393 subscript: '.' '.' '.' \| test \| [test] ':' [test] [sliceop]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1394 sliceop: ':' [test]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1395 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1396 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1397 if (TYPE(ch) == DOT)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1398 return Ellipsis(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 if (NCH(n) == 1 && TYPE(ch) == test) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1401 /* 'step' variable hold no significance in terms of being used over
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1402 other vars */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1403 step = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1404 if (!step)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1405 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1406
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1407 return Index(step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1408 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1409
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1410 if (TYPE(ch) == test) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1411 lower = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1412 if (!lower)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1413 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1414 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1415
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1416 /* 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	1417 if (TYPE(ch) == COLON) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1418 if (NCH(n) > 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1419 node *n2 = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1420
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1421 if (TYPE(n2) == test) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1422 upper = ast_for_expr(c, n2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1423 if (!upper)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1424 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1425 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1426 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1427 } else if (NCH(n) > 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1428 node *n2 = CHILD(n, 2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1429
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1430 if (TYPE(n2) == test) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1431 upper = ast_for_expr(c, n2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1432 if (!upper)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1433 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1434 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1435 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1436
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1437 ch = CHILD(n, NCH(n) - 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1438 if (TYPE(ch) == sliceop) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1439 if (NCH(ch) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1440 /* No expression, so step is None */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1441 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1442 step = Name(new_identifier("None", c->c_arena), Load,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1443 LINENO(ch), ch->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1444 if (!step)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1445 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1446 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1447 ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1448 if (TYPE(ch) == test) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1449 step = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1450 if (!step)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1451 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1452 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1453 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1454 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1455
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	1456 return Slice(lower, upper, step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1457 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1458
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1459 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1460 ast_for_binop(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1461 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1462 /* Must account for a sequence of expressions.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1463 How should A op B op C by represented?
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1464 BinOp(BinOp(A, op, B), op, C).
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1465 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1466
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1467 int i, nops;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1468 expr_ty expr1, expr2, result;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1469 operator_ty newoperator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1470
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1471 expr1 = ast_for_expr(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1472 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1473 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1474
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1475 expr2 = ast_for_expr(c, CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1476 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1477 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1478
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1479 newoperator = get_operator(CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1480 if (!newoperator)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1481 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1482
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1483 result = BinOp(expr1, newoperator, expr2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1484 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1485 if (!result)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1486 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1487
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1488 nops = (NCH(n) - 1) / 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1489 for (i = 1; i < nops; i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1490 expr_ty tmp_result, tmp;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1491 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	1492
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1493 newoperator = get_operator(next_oper);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1494 if (!newoperator)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1495 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1496
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1497 tmp = ast_for_expr(c, CHILD(n, i * 2 + 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1498 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1499 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1500
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1501 tmp_result = BinOp(result, newoperator, tmp,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1502 LINENO(next_oper), next_oper->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1503 c->c_arena);
43470 995677219a65 Fix Coverity #158: Check the correct variable. Neal Norwitz <nnorwitz@gmail.com> parents: 42459 diff changeset	1504 if (!tmp_result)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1505 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1506 result = tmp_result;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1507 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1508 return result;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1509 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1510
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1511 static expr_ty
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1512 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	1513 {
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1514 /* trailer: '(' [arglist] ')' \| '[' subscriptlist ']' \| '.' NAME
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1515 subscriptlist: subscript (',' subscript)* [',']
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1516 subscript: '.' '.' '.' \| test \| [test] ':' [test] [sliceop]
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1517 */
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1518 REQ(n, trailer);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1519 if (TYPE(CHILD(n, 0)) == LPAR) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1520 if (NCH(n) == 2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1521 return Call(left_expr, NULL, NULL, NULL, NULL, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1522 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1523 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1524 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	1525 }
36679 e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1526 else if (TYPE(CHILD(n, 0)) == DOT ) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1527 return Attribute(left_expr, NEW_IDENTIFIER(CHILD(n, 1)), Load,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1528 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	1529 }
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1530 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1531 REQ(CHILD(n, 0), LSQB);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1532 REQ(CHILD(n, 2), RSQB);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1533 n = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1534 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1535 slice_ty slc = ast_for_slice(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1536 if (!slc)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1537 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1538 return Subscript(left_expr, slc, Load, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1539 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1540 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1541 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1542 /* The grammar is ambiguous here. The ambiguity is resolved
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1543 by treating the sequence as a tuple literal if there are
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1544 no slice features.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1545 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1546 int j;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1547 slice_ty slc;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1548 expr_ty e;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1549 bool simple = true;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1550 asdl_seq slices, elts;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1551 slices = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1552 if (!slices)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1553 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1554 for (j = 0; j < NCH(n); j += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1555 slc = ast_for_slice(c, CHILD(n, j));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1556 if (!slc)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1557 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1558 if (slc->kind != Index_kind)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1559 simple = false;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1560 asdl_seq_SET(slices, j / 2, slc);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1561 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1562 if (!simple) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1563 return Subscript(left_expr, ExtSlice(slices, c->c_arena),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1564 Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1565 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1566 /* extract Index values and put them in a Tuple */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1567 elts = asdl_seq_new(asdl_seq_LEN(slices), c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1568 if (!elts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1569 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1570 for (j = 0; j < asdl_seq_LEN(slices); ++j) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1571 slc = (slice_ty)asdl_seq_GET(slices, j);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1572 assert(slc->kind == Index_kind && slc->v.Index.value);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1573 asdl_seq_SET(elts, j, slc->v.Index.value);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1574 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1575 e = Tuple(elts, Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1576 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1577 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1578 return Subscript(left_expr, Index(e, c->c_arena),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1579 Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1580 }
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1581 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1582 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1583
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1584 static expr_ty
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1585 ast_for_factor(struct compiling c, const node n)
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1586 {
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1587 node pfactor, ppower, patom, pnum;
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1588 expr_ty expression;
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1589
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1590 /* If the unary - operator is applied to a constant, don't generate
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1591 a UNARY_NEGATIVE opcode. Just store the approriate value as a
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1592 constant. The peephole optimizer already does something like
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1593 this but it doesn't handle the case where the constant is
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1594 (sys.maxint - 1). In that case, we want a PyIntObject, not a
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1595 PyLongObject.
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1596 */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1597 if (TYPE(CHILD(n, 0)) == MINUS &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1598 NCH(n) == 2 &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1599 TYPE((pfactor = CHILD(n, 1))) == factor &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1600 NCH(pfactor) == 1 &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1601 TYPE((ppower = CHILD(pfactor, 0))) == power &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1602 NCH(ppower) == 1 &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1603 TYPE((patom = CHILD(ppower, 0))) == atom &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1604 TYPE((pnum = CHILD(patom, 0))) == NUMBER) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1605 char *s = PyObject_MALLOC(strlen(STR(pnum)) + 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1606 if (s == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1607 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1608 s[0] = '-';
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1609 strcpy(s + 1, STR(pnum));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1610 PyObject_FREE(STR(pnum));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1611 STR(pnum) = s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1612 return ast_for_atom(c, patom);
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1613 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1614
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1615 expression = ast_for_expr(c, CHILD(n, 1));
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1616 if (!expression)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1617 return NULL;
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1618
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1619 switch (TYPE(CHILD(n, 0))) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1620 case PLUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1621 return UnaryOp(UAdd, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1622 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1623 case MINUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1624 return UnaryOp(USub, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1625 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1626 case TILDE:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1627 return UnaryOp(Invert, expression, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1628 n->n_col_offset, c->c_arena);
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1629 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1630 PyErr_Format(PyExc_SystemError, "unhandled factor: %d",
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1631 TYPE(CHILD(n, 0)));
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1632 return NULL;
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1633 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1634
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1635 static expr_ty
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1636 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	1637 {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1638 /* power: atom trailer* ('*' factor)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1639 */
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1640 int i;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1641 expr_ty e, tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1642 REQ(n, power);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1643 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	1644 if (!e)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1645 return NULL;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1646 if (NCH(n) == 1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1647 return e;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1648 for (i = 1; i < NCH(n); i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1649 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1650 if (TYPE(ch) != trailer)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1651 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1652 tmp = ast_for_trailer(c, ch, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1653 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1654 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1655 tmp->lineno = e->lineno;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1656 tmp->col_offset = e->col_offset;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1657 e = tmp;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1658 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1659 if (TYPE(CHILD(n, NCH(n) - 1)) == factor) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1660 expr_ty f = ast_for_expr(c, CHILD(n, NCH(n) - 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1661 if (!f)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1662 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1663 tmp = BinOp(e, Pow, f, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1664 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1665 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1666 e = tmp;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1667 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1668 return e;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1669 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1670
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1671 /* 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	1672 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1673
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1674 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1675 ast_for_expr(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1676 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1677 /* 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	1678 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	1679 or_test: and_test ('or' and_test)*
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1680 and_test: not_test ('and' not_test)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1681 not_test: 'not' not_test \| comparison
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1682 comparison: expr (comp_op expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1683 expr: xor_expr ('\|' xor_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1684 xor_expr: and_expr ('^' and_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1685 and_expr: shift_expr ('&' shift_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1686 shift_expr: arith_expr (('<<'\|'>>') arith_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1687 arith_expr: term (('+'\|'-') term)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1688 term: factor ((''\|'/'\|'%'\|'//') factor)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1689 factor: ('+'\|'-'\|'~') factor \| power
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1690 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	1691
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1692 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	1693 to explicitly allow:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1694 [ 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	1695 (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	1696
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1697 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	1698 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	1699
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1700 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1701
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1702 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1703 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1704
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1705 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1706 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1707 case test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1708 case old_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1709 if (TYPE(CHILD(n, 0)) == lambdef \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1710 TYPE(CHILD(n, 0)) == old_lambdef)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1711 return ast_for_lambdef(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1712 else if (NCH(n) > 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1713 return ast_for_ifexpr(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1714 /* Fallthrough */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1715 case or_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1716 case and_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1717 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1718 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1719 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1720 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1721 seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1722 if (!seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1723 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1724 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1725 expr_ty e = ast_for_expr(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1726 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1727 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1728 asdl_seq_SET(seq, i / 2, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1729 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1730 if (!strcmp(STR(CHILD(n, 1)), "and"))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1731 return BoolOp(And, seq, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1732 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1733 assert(!strcmp(STR(CHILD(n, 1)), "or"));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1734 return BoolOp(Or, seq, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1735 case not_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1736 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1737 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1738 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1739 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1740 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1741 expr_ty expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1742 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1743 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1744
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1745 return UnaryOp(Not, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1746 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1747 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1748 case comparison:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1749 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1750 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1751 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1752 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1753 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1754 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1755 asdl_int_seq *ops;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1756 asdl_seq *cmps;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1757 ops = asdl_int_seq_new(NCH(n) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1758 if (!ops)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1759 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1760 cmps = asdl_seq_new(NCH(n) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1761 if (!cmps) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1762 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1763 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1764 for (i = 1; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1765 cmpop_ty newoperator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1766
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1767 newoperator = ast_for_comp_op(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1768 if (!newoperator) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1769 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1770 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1771
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1772 expression = ast_for_expr(c, CHILD(n, i + 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1773 if (!expression) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1774 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1775 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1776
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1777 asdl_seq_SET(ops, i / 2, newoperator);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1778 asdl_seq_SET(cmps, i / 2, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1779 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1780 expression = ast_for_expr(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1781 if (!expression) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1782 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1783 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1784
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1785 return Compare(expression, ops, cmps, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1786 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1787 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1788 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1789
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1790 /* The next five cases all handle BinOps. The main body of code
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1791 is the same in each case, but the switch turned inside out to
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1792 reuse the code for each type of operator.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1793 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1794 case expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1795 case xor_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1796 case and_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1797 case shift_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1798 case arith_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1799 case term:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1800 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1801 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1802 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1803 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1804 return ast_for_binop(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1805 case yield_expr: {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1806 expr_ty exp = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1807 if (NCH(n) == 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1808 exp = ast_for_testlist(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1809 if (!exp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1810 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1811 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1812 return Yield(exp, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1813 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1814 case factor:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1815 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1816 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1817 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1818 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1819 return ast_for_factor(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1820 case power:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1821 return ast_for_power(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1822 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1823 PyErr_Format(PyExc_SystemError, "unhandled expr: %d", TYPE(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1824 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1825 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1826 /* 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	1827 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1828 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1829
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1830 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1831 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	1832 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1833 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1834 arglist: (argument ',')* (argument [',']\| '' test [',' '*' test]
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1835 \| '**' test)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1836 argument: [test '='] test [gen_for] # Really [keyword '='] test
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1837 */
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 int i, nargs, nkeywords, ngens;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1840 asdl_seq *args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1841 asdl_seq *keywords;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1842 expr_ty vararg = NULL, kwarg = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1843
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1844 REQ(n, arglist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1845
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1846 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1847 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1848 ngens = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1849 for (i = 0; i < NCH(n); i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1850 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1851 if (TYPE(ch) == argument) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1852 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1853 nargs++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1854 else if (TYPE(CHILD(ch, 1)) == gen_for)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1855 ngens++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1856 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1857 nkeywords++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1858 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1859 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1860 if (ngens > 1 \|\| (ngens && (nargs \|\| nkeywords))) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1861 ast_error(n, "Generator expression must be parenthesized "
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1862 "if not sole argument");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1863 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1864 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1865
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1866 if (nargs + nkeywords + ngens > 255) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1867 ast_error(n, "more than 255 arguments");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1868 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1869 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1870
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	1871 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	1872 if (!args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1873 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	1874 keywords = asdl_seq_new(nkeywords, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1875 if (!keywords)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1876 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1877 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1878 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1879 for (i = 0; i < NCH(n); i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1880 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1881 if (TYPE(ch) == argument) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1882 expr_ty e;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1883 if (NCH(ch) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1884 if (nkeywords) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1885 ast_error(CHILD(ch, 0),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1886 "non-keyword arg after keyword arg");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1887 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1888 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1889 e = ast_for_expr(c, CHILD(ch, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1890 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1891 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1892 asdl_seq_SET(args, nargs++, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1893 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1894 else if (TYPE(CHILD(ch, 1)) == gen_for) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1895 e = ast_for_genexp(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1896 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1897 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1898 asdl_seq_SET(args, nargs++, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1899 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1900 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1901 keyword_ty kw;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1902 identifier key;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1903
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1904 /* CHILD(ch, 0) is test, but must be an identifier? */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1905 e = ast_for_expr(c, CHILD(ch, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1906 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1907 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1908 /* f(lambda x: x[0] = 3) ends up getting parsed with
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1909 * LHS test = lambda x: x[0], and RHS test = 3.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1910 * SF bug 132313 points out that complaining about a keyword
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1911 * then is very confusing.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1912 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1913 if (e->kind == Lambda_kind) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1914 ast_error(CHILD(ch, 0),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1915 "lambda cannot contain assignment");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1916 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1917 } else if (e->kind != Name_kind) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1918 ast_error(CHILD(ch, 0), "keyword can't be an expression");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1919 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1920 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1921 key = e->v.Name.id;
41974 c8b0e3b8b456 Disallow function calls like foo(None=1). Georg Brandl <georg@python.org> parents: 41773 diff changeset	1922 if (!strcmp(PyString_AS_STRING(key), "None")) {
c8b0e3b8b456 Disallow function calls like foo(None=1). Georg Brandl <georg@python.org> parents: 41773 diff changeset	1923 ast_error(CHILD(ch, 0), "assignment to None");
c8b0e3b8b456 Disallow function calls like foo(None=1). Georg Brandl <georg@python.org> parents: 41773 diff changeset	1924 return NULL;
c8b0e3b8b456 Disallow function calls like foo(None=1). Georg Brandl <georg@python.org> parents: 41773 diff changeset	1925 }
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1926 e = ast_for_expr(c, CHILD(ch, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1927 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1928 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1929 kw = keyword(key, e, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1930 if (!kw)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1931 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1932 asdl_seq_SET(keywords, nkeywords++, kw);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1933 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1934 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1935 else if (TYPE(ch) == STAR) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1936 vararg = ast_for_expr(c, CHILD(n, i+1));
45661 ff3e9aeaa692 Issue#2238: some syntax errors from args or kwargs expressions Amaury Forgeot d'Arc <amauryfa@gmail.com>* parents: 45447 diff changeset	1937 if (!vararg)
ff3e9aeaa692 Issue#2238: some syntax errors from args or kwargs expressions Amaury Forgeot d'Arc <amauryfa@gmail.com>* parents: 45447 diff changeset	1938 return NULL;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1939 i++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1940 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1941 else if (TYPE(ch) == DOUBLESTAR) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1942 kwarg = ast_for_expr(c, CHILD(n, i+1));
45661 ff3e9aeaa692 Issue#2238: some syntax errors from args or kwargs expressions Amaury Forgeot d'Arc <amauryfa@gmail.com>* parents: 45447 diff changeset	1943 if (!kwarg)
ff3e9aeaa692 Issue#2238: some syntax errors from args or kwargs expressions Amaury Forgeot d'Arc <amauryfa@gmail.com>* parents: 45447 diff changeset	1944 return NULL;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1945 i++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1946 }
35742 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
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1949 return Call(func, args, keywords, vararg, kwarg, func->lineno,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1950 func->col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1951 }
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 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	1954 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	1955 {
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1956 /* 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	1957 /* 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	1958 /* 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	1959 /* testlist1: test (',' test)* */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1960 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	1961 if (TYPE(n) == testlist_gexp) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1962 if (NCH(n) > 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1963 assert(TYPE(CHILD(n, 1)) != gen_for);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1964 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1965 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1966 assert(TYPE(n) == testlist \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1967 TYPE(n) == testlist_safe \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1968 TYPE(n) == testlist1);
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1969 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1970 if (NCH(n) == 1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1971 return ast_for_expr(c, CHILD(n, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1972 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1973 asdl_seq *tmp = seq_for_testlist(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1974 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1975 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1976 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	1977 }
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1978 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1979
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1980 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	1981 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	1982 {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1983 /* 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	1984 /* 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	1985 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	1986 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == gen_for)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1987 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	1988 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	1989 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1990
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1991 /* 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	1992 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	1993 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	1994 {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1995 /* 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	1996 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	1997 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	1998 if (NCH(n) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1999 expr_ty base;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2000 asdl_seq *bases = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2001 if (!bases)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2002 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2003 base = ast_for_expr(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2004 if (!base)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2005 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2006 asdl_seq_SET(bases, 0, base);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2007 return bases;
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2008 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2009
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2010 return seq_for_testlist(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2011 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2012
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2013 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2014 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	2015 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2016 REQ(n, expr_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2017 /* expr_stmt: testlist (augassign (yield_expr\|testlist)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2018 \| ('=' (yield_expr\|testlist))*)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2019 testlist: test (',' test)* [',']
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2020 augassign: '+=' \| '-=' \| '*=' \| '/=' \| '%=' \| '&=' \| '\|=' \| '^='
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2021 \| '<<=' \| '>>=' \| '**=' \| '//='
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2022 test: ... here starts the operator precendence dance
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2023 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2024
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2025 if (NCH(n) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2026 expr_ty e = ast_for_testlist(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2027 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2028 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2029
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2030 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	2031 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2032 else if (TYPE(CHILD(n, 1)) == augassign) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2033 expr_ty expr1, expr2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2034 operator_ty newoperator;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2035 node *ch = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2036
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2037 expr1 = ast_for_testlist(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2038 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2039 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2040 /* TODO(nas): Remove duplicated error checks (set_context does it) */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2041 switch (expr1->kind) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2042 case GeneratorExp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2043 ast_error(ch, "augmented assignment to generator "
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2044 "expression not possible");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2045 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2046 case Yield_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2047 ast_error(ch, "augmented assignment to yield "
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2048 "expression not possible");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2049 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2050 case Name_kind: {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2051 const char *var_name = PyString_AS_STRING(expr1->v.Name.id);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2052 if (var_name[0] == 'N' && !strcmp(var_name, "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2053 ast_error(ch, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2054 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2055 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2056 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2057 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2058 case Attribute_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2059 case Subscript_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2060 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2061 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2062 ast_error(ch, "illegal expression for augmented "
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2063 "assignment");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2064 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2065 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2066 if(!set_context(expr1, Store, ch))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2067 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2068
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2069 ch = CHILD(n, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2070 if (TYPE(ch) == testlist)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2071 expr2 = ast_for_testlist(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2072 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2073 expr2 = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2074 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2075 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2076
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2077 newoperator = ast_for_augassign(CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2078 if (!newoperator)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2079 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2080
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2081 return AugAssign(expr1, newoperator, expr2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2082 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2083 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2084 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2085 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2086 asdl_seq *targets;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2087 node *value;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2088 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2089
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2090 /* a normal assignment */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2091 REQ(CHILD(n, 1), EQUAL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2092 targets = asdl_seq_new(NCH(n) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2093 if (!targets)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2094 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2095 for (i = 0; i < NCH(n) - 2; i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2096 expr_ty e;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2097 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2098 if (TYPE(ch) == yield_expr) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2099 ast_error(ch, "assignment to yield expression not possible");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2100 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2101 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2102 e = ast_for_testlist(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2103
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2104 /* set context to assign */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2105 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2106 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2107
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2108 if (!set_context(e, Store, CHILD(n, i)))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2109 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2110
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2111 asdl_seq_SET(targets, i / 2, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2112 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2113 value = CHILD(n, NCH(n) - 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2114 if (TYPE(value) == testlist)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2115 expression = ast_for_testlist(c, value);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2116 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2117 expression = ast_for_expr(c, value);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2118 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2119 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2120 return Assign(targets, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2121 c->c_arena);
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2125 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2126 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	2127 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2128 /* print_stmt: 'print' ( [ test (',' test)* [','] ]
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2129 \| '>>' test [ (',' test)+ [','] ] )
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 expr_ty dest = NULL, expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2132 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2133 bool nl;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2134 int i, j, start = 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2135
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2136 REQ(n, print_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2137 if (NCH(n) >= 2 && TYPE(CHILD(n, 1)) == RIGHTSHIFT) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2138 dest = ast_for_expr(c, CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2139 if (!dest)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2140 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2141 start = 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2142 }
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	2143 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	2144 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2145 return NULL;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2146 for (i = start, j = 0; i < NCH(n); i += 2, ++j) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2147 expression = ast_for_expr(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2148 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2149 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2150 asdl_seq_SET(seq, j, expression);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2151 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2152 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	2153 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	2154 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2155
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2156 static asdl_seq *
37604 c732f66c913f Convert 0 to their respective enum types. Convert Martin v. Löwis <martin@v.loewis.de> parents: 37597 diff changeset	2157 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	2158 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2159 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2160 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2161 expr_ty e;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2162
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2163 REQ(n, exprlist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2164
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	2165 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	2166 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2167 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2168 for (i = 0; i < NCH(n); i += 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2169 e = ast_for_expr(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2170 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2171 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2172 asdl_seq_SET(seq, i / 2, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2173 if (context && !set_context(e, context, CHILD(n, i)))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2174 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2175 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2176 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2177 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2178
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2179 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2180 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	2181 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2182 asdl_seq *expr_list;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2183
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2184 /* del_stmt: 'del' exprlist */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2185 REQ(n, del_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2186
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2187 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	2188 if (!expr_list)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2189 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	2190 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	2191 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2192
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2193 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2194 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	2195 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2196 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2197 flow_stmt: break_stmt \| continue_stmt \| return_stmt \| raise_stmt
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2198 \| yield_stmt
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2199 break_stmt: 'break'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2200 continue_stmt: 'continue'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2201 return_stmt: 'return' [testlist]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2202 yield_stmt: yield_expr
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2203 yield_expr: 'yield' testlist
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2204 raise_stmt: 'raise' [test [',' test [',' test]]]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2205 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2206 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2207
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2208 REQ(n, flow_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2209 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2210 switch (TYPE(ch)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2211 case break_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2212 return Break(LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2213 case continue_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2214 return Continue(LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2215 case yield_stmt: { /* will reduce to yield_expr */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2216 expr_ty exp = ast_for_expr(c, CHILD(ch, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2217 if (!exp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2218 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2219 return Expr(exp, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2220 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2221 case return_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2222 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2223 return Return(NULL, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2224 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2225 expr_ty expression = ast_for_testlist(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2226 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2227 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2228 return Return(expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2229 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2230 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2231 case raise_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2232 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2233 return Raise(NULL, NULL, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2234 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2235 else if (NCH(ch) == 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2236 expr_ty expression = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2237 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2238 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2239 return Raise(expression, NULL, NULL, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2240 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2241 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2242 else if (NCH(ch) == 4) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2243 expr_ty expr1, expr2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2244
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2245 expr1 = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2246 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2247 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2248 expr2 = ast_for_expr(c, CHILD(ch, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2249 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2250 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2251
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2252 return Raise(expr1, expr2, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2253 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2254 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2255 else if (NCH(ch) == 6) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2256 expr_ty expr1, expr2, expr3;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2257
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2258 expr1 = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2259 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2260 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2261 expr2 = ast_for_expr(c, CHILD(ch, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2262 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2263 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2264 expr3 = ast_for_expr(c, CHILD(ch, 5));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2265 if (!expr3)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2266 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2267
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2268 return Raise(expr1, expr2, expr3, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2269 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2270 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2271 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2272 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2273 "unexpected flow_stmt: %d", TYPE(ch));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2274 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2275 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2276
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2277 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	2278 return NULL;
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2281 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	2282 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	2283 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2284 /*
36742 658f8ff2a442 Make 'as' an actual keyword when with's future statement is used. Not Thomas Wouters <thomas@python.org> parents: 36718 diff changeset	2285 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	2286 dotted_as_name: dotted_name ['as' NAME]
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2287 dotted_name: NAME ('.' NAME)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2288 */
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	2289 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	2290
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2291 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2292 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2293 case import_as_name:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2294 str = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2295 if (NCH(n) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2296 str = NEW_IDENTIFIER(CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2297 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2298 return alias(NEW_IDENTIFIER(CHILD(n, 0)), str, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2299 case dotted_as_name:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2300 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2301 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2302 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2303 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2304 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2305 alias_ty a = alias_for_import_name(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2306 if (!a)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2307 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2308 assert(!a->asname);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2309 a->asname = NEW_IDENTIFIER(CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2310 return a;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2311 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2312 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2313 case dotted_name:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2314 if (NCH(n) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2315 return alias(NEW_IDENTIFIER(CHILD(n, 0)), NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2316 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2317 /* Create a string of the form "a.b.c" */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2318 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2319 size_t len;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2320 char *s;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2321
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2322 len = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2323 for (i = 0; i < NCH(n); i += 2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2324 /* length of string plus one for the dot */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2325 len += strlen(STR(CHILD(n, i))) + 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2326 len--; /* the last name doesn't have a dot */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2327 str = PyString_FromStringAndSize(NULL, len);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2328 if (!str)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2329 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2330 s = PyString_AS_STRING(str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2331 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2332 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2333 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2334 char *sch = STR(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2335 strcpy(s, STR(CHILD(n, i)));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2336 s += strlen(sch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2337 *s++ = '.';
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2338 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2339 --s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2340 *s = '\0';
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2341 PyString_InternInPlace(&str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2342 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2343 return alias(str, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2344 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2345 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2346 case STAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2347 str = PyString_InternFromString("*");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2348 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2349 return alias(str, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2350 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2351 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2352 "unexpected import name: %d", TYPE(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2353 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2354 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2355
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2356 PyErr_SetString(PyExc_SystemError, "unhandled import name condition");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2357 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2358 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2359
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2360 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2361 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	2362 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2363 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2364 import_stmt: import_name \| import_from
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2365 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	2366 import_from: 'from' ('.'* dotted_name \| '.') 'import'
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2367 ('*' \| '(' import_as_names ')' \| import_as_names)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2368 */
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2369 int lineno;
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2370 int col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2371 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2372 asdl_seq *aliases;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2373
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2374 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	2375 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	2376 col_offset = n->n_col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2377 n = CHILD(n, 0);
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2378 if (TYPE(n) == import_name) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2379 n = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2380 REQ(n, dotted_as_names);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2381 aliases = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2382 if (!aliases)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2383 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2384 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2385 alias_ty import_alias = alias_for_import_name(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2386 if (!import_alias)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2387 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2388 asdl_seq_SET(aliases, i / 2, import_alias);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2389 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2390 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	2391 }
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2392 else if (TYPE(n) == import_from) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2393 int n_children;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2394 int idx, ndots = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2395 alias_ty mod = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2396 identifier modname;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2397
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2398 /* Count the number of dots (for relative imports) and check for the
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2399 optional module name */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2400 for (idx = 1; idx < NCH(n); idx++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2401 if (TYPE(CHILD(n, idx)) == dotted_name) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2402 mod = alias_for_import_name(c, CHILD(n, idx));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2403 idx++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2404 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2405 } else if (TYPE(CHILD(n, idx)) != DOT) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2406 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2407 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2408 ndots++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2409 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2410 idx++; /* skip over the 'import' keyword */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2411 switch (TYPE(CHILD(n, idx))) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2412 case STAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2413 /* from ... import * */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2414 n = CHILD(n, idx);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2415 n_children = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2416 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2417 case LPAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2418 /* from ... import (x, y, z) */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2419 n = CHILD(n, idx + 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2420 n_children = NCH(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2421 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2422 case import_as_names:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2423 /* from ... import x, y, z */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2424 n = CHILD(n, idx);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2425 n_children = NCH(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2426 if (n_children % 2 == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2427 ast_error(n, "trailing comma not allowed without"
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2428 " surrounding parentheses");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2429 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2430 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2431 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2432 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2433 ast_error(n, "Unexpected node-type in from-import");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2434 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2435 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2436
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2437 aliases = asdl_seq_new((n_children + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2438 if (!aliases)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2439 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2440
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2441 /* handle "from ... import " special b/c there's no children /
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2442 if (TYPE(n) == STAR) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2443 alias_ty import_alias = alias_for_import_name(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2444 if (!import_alias)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2445 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2446 asdl_seq_SET(aliases, 0, import_alias);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2447 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2448 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2449 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2450 alias_ty import_alias = alias_for_import_name(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2451 if (!import_alias)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2452 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2453 asdl_seq_SET(aliases, i / 2, import_alias);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2454 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2455 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2456 if (mod != NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2457 modname = mod->name;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2458 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2459 modname = new_identifier("", c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2460 return ImportFrom(modname, aliases, ndots, lineno, col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2461 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2462 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2463 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2464 "unknown import statement: starts with command '%s'",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2465 STR(CHILD(n, 0)));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2466 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2467 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2468
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2469 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2470 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	2471 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2472 /* global_stmt: 'global' NAME (',' NAME)* */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2473 identifier name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2474 asdl_seq *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2475 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2476
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2477 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	2478 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	2479 if (!s)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2480 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2481 for (i = 1; i < NCH(n); i += 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2482 name = NEW_IDENTIFIER(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2483 if (!name)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2484 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2485 asdl_seq_SET(s, i / 2, name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2486 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2487 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	2488 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2489
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2490 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2491 ast_for_exec_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2492 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2493 expr_ty expr1, globals = NULL, locals = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2494 int n_children = NCH(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2495 if (n_children != 2 && n_children != 4 && n_children != 6) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2496 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2497 "poorly formed 'exec' statement: %d parts to statement",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2498 n_children);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2499 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2500 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2501
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2502 /* exec_stmt: 'exec' expr ['in' test [',' test]] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2503 REQ(n, exec_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2504 expr1 = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2505 if (!expr1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2506 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2507 if (n_children >= 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2508 globals = ast_for_expr(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2509 if (!globals)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2510 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2511 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2512 if (n_children == 6) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2513 locals = ast_for_expr(c, CHILD(n, 5));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2514 if (!locals)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2515 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2516 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2517
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2518 return Exec(expr1, globals, locals, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2519 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2520 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2521
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2522 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2523 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	2524 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2525 /* assert_stmt: 'assert' test [',' test] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2526 REQ(n, assert_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2527 if (NCH(n) == 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2528 expr_ty expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2529 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2530 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2531 return Assert(expression, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2532 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2533 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2534 else if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2535 expr_ty expr1, expr2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2536
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2537 expr1 = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2538 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2539 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2540 expr2 = ast_for_expr(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2541 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2542 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2543
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2544 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	2545 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2546 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2547 "improper number of parts to 'assert' statement: %d",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2548 NCH(n));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2549 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2550 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2551
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2552 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2553 ast_for_suite(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2554 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2555 /* 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	2556 asdl_seq *seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2557 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2558 int i, total, num, end, pos = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2559 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2560
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2561 REQ(n, suite);
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 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	2564 seq = asdl_seq_new(total, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2565 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2566 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2567 if (TYPE(CHILD(n, 0)) == simple_stmt) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2568 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2569 /* simple_stmt always ends with a NEWLINE,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2570 and may have a trailing SEMI
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2571 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2572 end = NCH(n) - 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2573 if (TYPE(CHILD(n, end - 1)) == SEMI)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2574 end--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2575 /* loop by 2 to skip semi-colons */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2576 for (i = 0; i < end; i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2577 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2578 s = ast_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2579 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2580 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2581 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2582 }
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 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2585 for (i = 2; i < (NCH(n) - 1); i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2586 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2587 REQ(ch, stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2588 num = num_stmts(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2589 if (num == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2590 /* small_stmt or compound_stmt with only one child */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2591 s = ast_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2592 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2593 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2594 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2595 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2596 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2597 int j;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2598 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2599 REQ(ch, simple_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2600 for (j = 0; j < NCH(ch); j += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2601 /* statement terminates with a semi-colon ';' */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2602 if (NCH(CHILD(ch, j)) == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2603 assert((j + 1) == NCH(ch));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2604 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2605 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2606 s = ast_for_stmt(c, CHILD(ch, j));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2607 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2608 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2609 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2610 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2611 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2612 }
35742 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 assert(pos == seq->size);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2615 return seq;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2618 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2619 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	2620 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2621 /* if_stmt: 'if' test ':' suite ('elif' test ':' suite)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2622 ['else' ':' suite]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2623 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2624 char *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2625
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2626 REQ(n, if_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2627
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2628 if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2629 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2630 asdl_seq *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2631
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2632 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2633 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2634 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2635 suite_seq = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2636 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2637 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2638
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2639 return If(expression, suite_seq, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2640 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2641 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2642
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2643 s = STR(CHILD(n, 4));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2644 /* 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	2645 's' for el_s_e, or
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2646 'i' for el_i_f
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2647 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2648 if (s[2] == 's') {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2649 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2650 asdl_seq seq1, seq2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2651
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2652 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2653 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2654 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2655 seq1 = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2656 if (!seq1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2657 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2658 seq2 = ast_for_suite(c, CHILD(n, 6));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2659 if (!seq2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2660 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2661
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2662 return If(expression, seq1, seq2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2663 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2664 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2665 else if (s[2] == 'i') {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2666 int i, n_elif, has_else = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2667 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2668 asdl_seq *suite_seq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2669 asdl_seq *orelse = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2670 n_elif = NCH(n) - 4;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2671 /* must reference the child n_elif+1 since 'else' token is third,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2672 not fourth, child from the end. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2673 if (TYPE(CHILD(n, (n_elif + 1))) == NAME
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2674 && STR(CHILD(n, (n_elif + 1)))[2] == 's') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2675 has_else = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2676 n_elif -= 3;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2677 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2678 n_elif /= 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2679
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2680 if (has_else) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2681 asdl_seq *suite_seq2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2682
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2683 orelse = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2684 if (!orelse)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2685 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2686 expression = ast_for_expr(c, CHILD(n, NCH(n) - 6));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2687 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2688 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2689 suite_seq = ast_for_suite(c, CHILD(n, NCH(n) - 4));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2690 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2691 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2692 suite_seq2 = ast_for_suite(c, CHILD(n, NCH(n) - 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2693 if (!suite_seq2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2694 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2695
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2696 asdl_seq_SET(orelse, 0,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2697 If(expression, suite_seq, suite_seq2,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2698 LINENO(CHILD(n, NCH(n) - 6)),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2699 CHILD(n, NCH(n) - 6)->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2700 c->c_arena));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2701 /* the just-created orelse handled the last elif */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2702 n_elif--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2703 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2704
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2705 for (i = 0; i < n_elif; i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2706 int off = 5 + (n_elif - i - 1) * 4;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2707 asdl_seq *newobj = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2708 if (!newobj)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2709 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2710 expression = ast_for_expr(c, CHILD(n, off));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2711 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2712 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2713 suite_seq = ast_for_suite(c, CHILD(n, off + 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2714 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2715 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2716
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2717 asdl_seq_SET(newobj, 0,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2718 If(expression, suite_seq, orelse,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2719 LINENO(CHILD(n, off)),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2720 CHILD(n, off)->n_col_offset, c->c_arena));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2721 orelse = newobj;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2722 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2723 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2724 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2725 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2726 suite_seq = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2727 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2728 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2729 return If(expression, suite_seq, orelse,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2730 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	2731 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2732
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2733 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2734 "unexpected token in 'if' statement: %s", s);
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2735 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2736 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2737
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2738 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2739 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	2740 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2741 /* while_stmt: 'while' test ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2742 REQ(n, while_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2743
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2744 if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2745 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2746 asdl_seq *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2747
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2748 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2749 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2750 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2751 suite_seq = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2752 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2753 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2754 return While(expression, suite_seq, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2755 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2756 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2757 else if (NCH(n) == 7) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2758 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2759 asdl_seq seq1, seq2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2760
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2761 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2762 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2763 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2764 seq1 = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2765 if (!seq1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2766 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2767 seq2 = ast_for_suite(c, CHILD(n, 6));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2768 if (!seq2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2769 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2770
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2771 return While(expression, seq1, seq2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2772 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2773 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2774
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2775 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2776 "wrong number of tokens for 'while' statement: %d",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2777 NCH(n));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2778 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2779 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2780
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2781 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2782 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	2783 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2784 asdl_seq _target, seq = NULL, *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2785 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2786 expr_ty target;
39067 7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2787 const node *node_target;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2788 /* for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2789 REQ(n, for_stmt);
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 if (NCH(n) == 9) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2792 seq = ast_for_suite(c, CHILD(n, 8));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2793 if (!seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2794 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2795 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2796
39067 7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2797 node_target = CHILD(n, 1);
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2798 _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	2799 if (!_target)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2800 return NULL;
39067 7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2801 /* Check the # of children rather than the length of _target, since
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2802 for x, in ... has 1 element in _target, but still requires a Tuple. */
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2803 if (NCH(node_target) == 1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2804 target = (expr_ty)asdl_seq_GET(_target, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2805 else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2806 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	2807
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2808 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	2809 if (!expression)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2810 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2811 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	2812 if (!suite_seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2813 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2814
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37235 diff changeset	2815 return For(target, expression, suite_seq, seq, LINENO(n), n->n_col_offset,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2816 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2817 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2818
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2819 static excepthandler_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2820 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	2821 {
41773 f19e631be101 Backport PEP 3110's new 'except' syntax to 2.6. Collin Winter <collinw@gmail.com> parents: 41579 diff changeset	2822 /* except_clause: 'except' [test [(',' \| 'as') test]] */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2823 REQ(exc, except_clause);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2824 REQ(body, suite);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2825
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2826 if (NCH(exc) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2827 asdl_seq *suite_seq = ast_for_suite(c, body);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2828 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2829 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2830
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2831 return excepthandler(NULL, NULL, suite_seq, LINENO(exc),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2832 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2833 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2834 else if (NCH(exc) == 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2835 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2836 asdl_seq *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2837
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2838 expression = ast_for_expr(c, CHILD(exc, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2839 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2840 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2841 suite_seq = ast_for_suite(c, body);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2842 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2843 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2844
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2845 return excepthandler(expression, NULL, suite_seq, LINENO(exc),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2846 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2847 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2848 else if (NCH(exc) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2849 asdl_seq *suite_seq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2850 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2851 expr_ty e = ast_for_expr(c, CHILD(exc, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2852 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2853 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2854 if (!set_context(e, Store, CHILD(exc, 3)))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2855 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2856 expression = ast_for_expr(c, CHILD(exc, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2857 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2858 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2859 suite_seq = ast_for_suite(c, body);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2860 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2861 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2862
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2863 return excepthandler(expression, e, suite_seq, LINENO(exc),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2864 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2865 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2866
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2867 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2868 "wrong number of children for 'except' clause: %d",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2869 NCH(exc));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2870 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2871 }
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 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2874 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	2875 {
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2876 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	2877 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	2878 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	2879
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2880 REQ(n, try_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2881
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2882 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	2883 if (body == NULL)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2884 return NULL;
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2885
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2886 if (TYPE(CHILD(n, nch - 3)) == NAME) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2887 if (strcmp(STR(CHILD(n, nch - 3)), "finally") == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2888 if (nch >= 9 && TYPE(CHILD(n, nch - 6)) == NAME) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2889 /* we can assume it's an "else",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2890 because nch >= 9 for try-else-finally and
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2891 it would otherwise have a type of except_clause */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2892 orelse = ast_for_suite(c, CHILD(n, nch - 4));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2893 if (orelse == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2894 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2895 n_except--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2896 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2897
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2898 finally = ast_for_suite(c, CHILD(n, nch - 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2899 if (finally == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2900 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2901 n_except--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2902 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2903 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2904 /* we can assume it's an "else",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2905 otherwise it would have a type of except_clause */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2906 orelse = ast_for_suite(c, CHILD(n, nch - 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2907 if (orelse == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2908 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2909 n_except--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2910 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2911 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2912 else if (TYPE(CHILD(n, nch - 3)) != except_clause) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2913 ast_error(n, "malformed 'try' statement");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2914 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2915 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2916
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2917 if (n_except > 0) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2918 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2919 stmt_ty except_st;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2920 /* process except statements to create a try ... except */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2921 asdl_seq *handlers = asdl_seq_new(n_except, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2922 if (handlers == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2923 return NULL;
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2924
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2925 for (i = 0; i < n_except; i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2926 excepthandler_ty e = ast_for_except_clause(c, CHILD(n, 3 + i * 3),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2927 CHILD(n, 5 + i * 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2928 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2929 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2930 asdl_seq_SET(handlers, i, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2931 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2932
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2933 except_st = TryExcept(body, handlers, orelse, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2934 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2935 if (!finally)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2936 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	2937
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2938 /* if a 'finally' is present too, we nest the TryExcept within a
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2939 TryFinally to emulate try ... except ... finally */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2940 body = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2941 if (body == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2942 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2943 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	2944 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2945
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2946 /* 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	2947 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	2948 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	2949 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2950
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2951 static expr_ty
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2952 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	2953 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2954 REQ(n, with_var);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2955 return ast_for_expr(c, CHILD(n, 1));
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2956 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2957
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2958 /* with_stmt: 'with' test [ with_var ] ':' suite */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2959 static stmt_ty
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2960 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	2961 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2962 expr_ty context_expr, optional_vars = NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2963 int suite_index = 3; /* skip 'with', test, and ':' */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2964 asdl_seq *suite_seq;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2965
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2966 assert(TYPE(n) == with_stmt);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2967 context_expr = ast_for_expr(c, CHILD(n, 1));
41205 b43a52f71696 Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements. Collin Winter <collinw@gmail.com> parents: 40972 diff changeset	2968 if (!context_expr)
b43a52f71696 Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements. Collin Winter <collinw@gmail.com> parents: 40972 diff changeset	2969 return NULL;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2970 if (TYPE(CHILD(n, 2)) == with_var) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2971 optional_vars = ast_for_with_var(c, CHILD(n, 2));
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2972
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2973 if (!optional_vars) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2974 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2975 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2976 if (!set_context(optional_vars, Store, n)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2977 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2978 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2979 suite_index = 4;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2980 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2981
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2982 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	2983 if (!suite_seq) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2984 return NULL;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2985 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2986 return With(context_expr, optional_vars, suite_seq, LINENO(n),
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2987 n->n_col_offset, c->c_arena);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2988 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2989
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2990 static stmt_ty
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	2991 ast_for_classdef(struct compiling c, const node n, asdl_seq *decorator_seq)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2992 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2993 /* classdef: 'class' NAME ['(' testlist ')'] ':' suite */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2994 asdl_seq bases, s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2995
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2996 REQ(n, classdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2997
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2998 if (!strcmp(STR(CHILD(n, 1)), "None")) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2999 ast_error(n, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3000 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3001 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3002
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3003 if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3004 s = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3005 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3006 return NULL;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3007 return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), NULL, s, decorator_seq,
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3008 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	3009 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3010 /* check for empty base list */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3011 if (TYPE(CHILD(n,3)) == RPAR) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3012 s = ast_for_suite(c, CHILD(n,5));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3013 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3014 return NULL;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3015 return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), NULL, s, decorator_seq,
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3016 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	3017 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3018
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3019 /* 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	3020 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	3021 if (!bases)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3022 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3023
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3024 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	3025 if (!s)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3026 return NULL;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3027 return ClassDef(NEW_IDENTIFIER(CHILD(n, 1)), bases, s, decorator_seq,
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3028 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	3029 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3030
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3031 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3032 ast_for_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3033 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3034 if (TYPE(n) == stmt) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3035 assert(NCH(n) == 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3036 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3037 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3038 if (TYPE(n) == simple_stmt) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3039 assert(num_stmts(n) == 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3040 n = CHILD(n, 0);
35742 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 if (TYPE(n) == small_stmt) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3043 REQ(n, small_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3044 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3045 /* small_stmt: expr_stmt \| print_stmt \| del_stmt \| pass_stmt
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3046 \| flow_stmt \| import_stmt \| global_stmt \| exec_stmt
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3047 \| assert_stmt
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3048 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3049 switch (TYPE(n)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3050 case expr_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3051 return ast_for_expr_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3052 case print_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3053 return ast_for_print_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3054 case del_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3055 return ast_for_del_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3056 case pass_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3057 return Pass(LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3058 case flow_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3059 return ast_for_flow_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3060 case import_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3061 return ast_for_import_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3062 case global_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3063 return ast_for_global_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3064 case exec_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3065 return ast_for_exec_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3066 case assert_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3067 return ast_for_assert_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3068 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3069 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3070 "unhandled small_stmt: TYPE=%d NCH=%d\n",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3071 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3072 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3073 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3074 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3075 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3076 /* compound_stmt: if_stmt \| while_stmt \| for_stmt \| try_stmt
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3077 \| funcdef \| classdef \| decorated
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3078 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3079 node *ch = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3080 REQ(n, compound_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3081 switch (TYPE(ch)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3082 case if_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3083 return ast_for_if_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3084 case while_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3085 return ast_for_while_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3086 case for_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3087 return ast_for_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3088 case try_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3089 return ast_for_try_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3090 case with_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3091 return ast_for_with_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3092 case funcdef:
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3093 return ast_for_funcdef(c, ch, NULL);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3094 case classdef:
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3095 return ast_for_classdef(c, ch, NULL);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3096 case decorated:
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3097 return ast_for_decorated(c, ch);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3098 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3099 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3100 "unhandled small_stmt: TYPE=%d NCH=%d\n",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3101 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3102 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3103 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3104 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3105 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3106
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3107 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3108 parsenumber(const char *s)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3109 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3110 const char *end;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3111 long x;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3112 double dx;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3113 #ifndef WITHOUT_COMPLEX
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3114 Py_complex c;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3115 int imflag;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3116 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3117
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3118 errno = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3119 end = s + strlen(s) - 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3120 #ifndef WITHOUT_COMPLEX
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3121 imflag = end == 'j' \|\| end == 'J';
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3122 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3123 if (end == 'l' \|\| end == 'L')
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3124 return PyLong_FromString((char )s, (char *)0, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3125 if (s[0] == '0') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3126 x = (long) PyOS_strtoul((char )s, (char *)&end, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3127 if (x < 0 && errno == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3128 return PyLong_FromString((char *)s,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3129 (char **)0,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3130 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3131 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3132 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3133 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3134 x = PyOS_strtol((char )s, (char *)&end, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3135 if (*end == '\0') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3136 if (errno != 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3137 return PyLong_FromString((char )s, (char *)0, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3138 return PyInt_FromLong(x);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3139 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3140 /* XXX Huge floats may silently fail */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3141 #ifndef WITHOUT_COMPLEX
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3142 if (imflag) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3143 c.real = 0.;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3144 PyFPE_START_PROTECT("atof", return 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3145 c.imag = PyOS_ascii_atof(s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3146 PyFPE_END_PROTECT(c)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3147 return PyComplex_FromCComplex(c);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3148 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3149 else
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3150 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3151 {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3152 PyFPE_START_PROTECT("atof", return 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3153 dx = PyOS_ascii_atof(s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3154 PyFPE_END_PROTECT(dx)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3155 return PyFloat_FromDouble(dx);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3156 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3157 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3158
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3159 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3160 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	3161 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3162 #ifndef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3163 Py_FatalError("decode_utf8 should not be called in this build.");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3164 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3165 #else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3166 PyObject u, v;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3167 char s, t;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3168 t = s = (char )sPtr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3169 /* while (s < end && s != '\\') s++; / /* inefficient for u".." */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3170 while (s < end && (*s & 0x80)) s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3171 *sPtr = s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3172 u = PyUnicode_DecodeUTF8(t, s - t, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3173 if (u == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3174 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3175 v = PyUnicode_AsEncodedString(u, encoding, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3176 Py_DECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3177 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3178 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3179 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3180
42459 dbfc3cf1522d Place #ifdef Py_USING_UNICODE around decode_unicode(). Georg Brandl <georg@python.org> parents: 42308 diff changeset	3181 #ifdef Py_USING_UNICODE
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3182 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3183 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	3184 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3185 PyObject v, u;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3186 char *buf;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3187 char *p;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3188 const char *end;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3189 if (encoding == NULL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3190 buf = (char *)s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3191 u = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3192 } else if (strcmp(encoding, "iso-8859-1") == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3193 buf = (char *)s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3194 u = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3195 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3196 /* "\XX" may become "\u005c\uHHLL" (12 bytes) */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3197 u = PyString_FromStringAndSize((char )NULL, len 4);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3198 if (u == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3199 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3200 p = buf = PyString_AsString(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3201 end = s + len;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3202 while (s < end) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3203 if (*s == '\\') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3204 p++ = s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3205 if (*s & 0x80) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3206 strcpy(p, "u005c");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3207 p += 5;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3208 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3209 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3210 if (s & 0x80) { / XXX inefficient */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3211 PyObject *w;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3212 char *r;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3213 Py_ssize_t rn, i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3214 w = decode_utf8(&s, end, "utf-16-be");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3215 if (w == NULL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3216 Py_DECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3217 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3218 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3219 r = PyString_AsString(w);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3220 rn = PyString_Size(w);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3221 assert(rn % 2 == 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3222 for (i = 0; i < rn; i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3223 sprintf(p, "\\u%02x%02x",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3224 r[i + 0] & 0xFF,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3225 r[i + 1] & 0xFF);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3226 p += 6;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3227 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3228 Py_DECREF(w);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3229 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3230 p++ = s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3231 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3232 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3233 len = p - buf;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3234 s = buf;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3235 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3236 if (rawmode)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3237 v = PyUnicode_DecodeRawUnicodeEscape(s, len, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3238 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3239 v = PyUnicode_DecodeUnicodeEscape(s, len, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3240 Py_XDECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3241 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3242 }
42459 dbfc3cf1522d Place #ifdef Py_USING_UNICODE around decode_unicode(). Georg Brandl <georg@python.org> parents: 42308 diff changeset	3243 #endif
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3244
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3245 /* 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	3246 * 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	3247 * 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	3248 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3249 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3250 parsestr(const char s, const char encoding)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3251 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3252 size_t len;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3253 int quote = Py_CHARMASK(*s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3254 int rawmode = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3255 int need_encoding;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3256 int unicode = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3257
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3258 if (isalpha(quote) \|\| quote == '_') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3259 if (quote == 'u' \|\| quote == 'U') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3260 quote = *++s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3261 unicode = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3262 }
44747 8da9ebf73026 Added bytes and b'' as aliases for str and '' Christian Heimes <christian@cheimes.de> parents: 44572 diff changeset	3263 if (quote == 'b' \|\| quote == 'B') {
8da9ebf73026 Added bytes and b'' as aliases for str and '' Christian Heimes <christian@cheimes.de> parents: 44572 diff changeset	3264 quote = *++s;
8da9ebf73026 Added bytes and b'' as aliases for str and '' Christian Heimes <christian@cheimes.de> parents: 44572 diff changeset	3265 }
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3266 if (quote == 'r' \|\| quote == 'R') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3267 quote = *++s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3268 rawmode = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3269 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3270 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3271 if (quote != '\'' && quote != '\"') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3272 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3273 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3274 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3275 s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3276 len = strlen(s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3277 if (len > INT_MAX) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3278 PyErr_SetString(PyExc_OverflowError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3279 "string to parse is too long");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3280 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3281 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3282 if (s[--len] != quote) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3283 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3284 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3285 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3286 if (len >= 4 && s[0] == quote && s[1] == quote) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3287 s += 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3288 len -= 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3289 if (s[--len] != quote \|\| s[--len] != quote) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3290 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3291 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3292 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3293 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3294 #ifdef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3295 if (unicode \|\| Py_UnicodeFlag) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3296 return decode_unicode(s, len, rawmode, encoding);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3297 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3298 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3299 need_encoding = (encoding != NULL &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3300 strcmp(encoding, "utf-8") != 0 &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3301 strcmp(encoding, "iso-8859-1") != 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3302 if (rawmode \|\| strchr(s, '\\') == NULL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3303 if (need_encoding) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3304 #ifndef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3305 /* This should not happen - we never see any other
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3306 encoding. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3307 Py_FatalError(
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3308 "cannot deal with encodings in this build.");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3309 #else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3310 PyObject v, u = PyUnicode_DecodeUTF8(s, len, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3311 if (u == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3312 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3313 v = PyUnicode_AsEncodedString(u, encoding, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3314 Py_DECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3315 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3316 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3317 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3318 return PyString_FromStringAndSize(s, len);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3319 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3320 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3321
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3322 return PyString_DecodeEscape(s, len, NULL, unicode,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3323 need_encoding ? encoding : NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3324 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3325
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3326 /* 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	3327 * 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	3328 * pasting the intermediate results together.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3329 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3330 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3331 parsestrplus(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3332 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3333 PyObject *v;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3334 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3335 REQ(CHILD(n, 0), STRING);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3336 if ((v = parsestr(STR(CHILD(n, 0)), c->c_encoding)) != NULL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3337 /* String literal concatenation */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3338 for (i = 1; i < NCH(n); i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3339 PyObject *s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3340 s = parsestr(STR(CHILD(n, i)), c->c_encoding);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3341 if (s == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3342 goto onError;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3343 if (PyString_Check(v) && PyString_Check(s)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3344 PyString_ConcatAndDel(&v, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3345 if (v == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3346 goto onError;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3347 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3348 #ifdef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3349 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3350 PyObject *temp = PyUnicode_Concat(v, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3351 Py_DECREF(s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3352 Py_DECREF(v);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3353 v = temp;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3354 if (v == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3355 goto onError;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3356 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3357 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3358 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3359 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3360 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3361
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3362 onError:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3363 Py_XDECREF(v);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3364 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3365 }

Mercurial > cpython-lru_cache-weakref

annotate Python/ast.c @ 45905:2a01075cd902 legacy-trunk