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

annotate Python/ast.c @ 47516:f3df51b60dc2 legacy-trunk

change Py3k backquote warning to a SyntaxWarning and add a test

author	Benjamin Peterson <benjamin@python.org>
date	Sun, 08 Jun 2008 02:05:33 +0000
parents	4fe192d48960
children	31aee67019a2

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 */
46118 c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	21 int c_future_unicode; /* __future__ unicode literals flag */
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	22 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	23 const char c_filename; / filename */
35742 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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	26 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	27 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	28 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	29 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	30 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	31 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	32 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	33 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	34 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	35
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	36 /* Note different signature for ast_for_call */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	37 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	38
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	39 static PyObject parsenumber(struct compiling , const char *);
46118 c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	40 static PyObject parsestr(struct compiling , const char *);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	41 static PyObject parsestrplus(struct compiling , const node *n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	42
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	43 #ifndef LINENO
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	44 #define LINENO(n) ((n)->n_lineno)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	45 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	46
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	47 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	48 new_identifier(const char* n, PyArena *arena) {
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	49 PyObject* id = PyBytes_InternFromString(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	50 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	51 return id;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	52 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	53
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	54 #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	55
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	56 /* 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	57 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	58 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	59 the filename to everything function.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	60
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	61 XXX Maybe we should just pass the filename...
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	64 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	65 ast_error(const node n, const char errstr)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	66 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	67 PyObject *u = Py_BuildValue("zi", errstr, LINENO(n));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	68 if (!u)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	69 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	70 PyErr_SetObject(PyExc_SyntaxError, u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	71 Py_DECREF(u);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	72 return 0;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	75 static void
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	76 ast_error_finish(const char *filename)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	77 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	78 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	79 long lineno;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	80
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	81 assert(PyErr_Occurred());
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	82 if (!PyErr_ExceptionMatches(PyExc_SyntaxError))
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	83 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	84
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	85 PyErr_Fetch(&type, &value, &tback);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	86 errstr = PyTuple_GetItem(value, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	87 if (!errstr)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	88 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	89 Py_INCREF(errstr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	90 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	91 if (lineno == -1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	92 Py_DECREF(errstr);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	93 return;
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	94 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	95 Py_DECREF(value);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	96
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	97 loc = PyErr_ProgramText(filename, lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	98 if (!loc) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	99 Py_INCREF(Py_None);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	100 loc = Py_None;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	101 }
36231 d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits Neal Norwitz <nnorwitz@gmail.com> parents: 36224 diff changeset	102 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	103 Py_DECREF(loc);
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	104 if (!tmp) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	105 Py_DECREF(errstr);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	106 return;
36000 cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions). Neal Norwitz <nnorwitz@gmail.com> parents: 35990 diff changeset	107 }
38406 8f7c7aeac3a5 Replace Py_BuildValue("OO") by PyTuple_Pack. Georg Brandl <georg@python.org> parents: 38218 diff changeset	108 value = PyTuple_Pack(2, errstr, tmp);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	109 Py_DECREF(errstr);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	110 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	111 if (!value)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	112 return;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	113 PyErr_Restore(type, value, tback);
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	116 /* num_stmts() returns number of contained statements.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	117
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	118 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	119 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	120 grammar:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	121
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	122 stmt: simple_stmt \| compound_stmt
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	123 simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	124
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	125 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	126 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	127 small_stmt elements is returned.
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	130 static int
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	131 num_stmts(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	132 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	133 int i, l;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	134 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	135
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	136 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	137 case single_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	138 if (TYPE(CHILD(n, 0)) == NEWLINE)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	139 return 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	140 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	141 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	142 case file_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	143 l = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	144 for (i = 0; i < NCH(n); i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	145 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	146 if (TYPE(ch) == stmt)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	147 l += num_stmts(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	148 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	149 return l;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	150 case stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	151 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	152 case compound_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	153 return 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	154 case simple_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	155 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	156 case suite:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	157 if (NCH(n) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	158 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	159 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	160 l = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	161 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	162 l += num_stmts(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	163 return l;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	164 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	165 default: {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	166 char buf[128];
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	167
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	168 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	169 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	170 Py_FatalError(buf);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	171 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	172 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	173 assert(0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	174 return 0;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	177 /* 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	178 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	179
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	180 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	181 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	182 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	183 {
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	184 int i, j, k, num;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	185 asdl_seq *stmts = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	186 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	187 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	188 struct compiling c;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	189
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	190 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	191 c.c_encoding = "utf-8";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	192 if (TYPE(n) == encoding_decl) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	193 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	194 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	195 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	196 } else if (TYPE(n) == encoding_decl) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	197 c.c_encoding = STR(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	198 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	199 } else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	200 c.c_encoding = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	201 }
46118 c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	202 c.c_future_unicode = flags && flags->cf_flags & CO_FUTURE_UNICODE_LITERALS;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	203 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	204 c.c_filename = filename;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	205
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	206 k = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	207 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	208 case file_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	209 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	210 if (!stmts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	211 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	212 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	213 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	214 if (TYPE(ch) == NEWLINE)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	215 continue;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	216 REQ(ch, stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	217 num = num_stmts(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	218 if (num == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	219 s = ast_for_stmt(&c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	220 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	221 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	222 asdl_seq_SET(stmts, k++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	223 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	224 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	225 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	226 REQ(ch, simple_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	227 for (j = 0; j < num; j++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	228 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	229 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	230 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	231 asdl_seq_SET(stmts, k++, s);
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 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	234 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	235 return Module(stmts, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	236 case eval_input: {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	237 expr_ty testlist_ast;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	238
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	239 /* XXX Why not gen_for here? */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	240 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	241 if (!testlist_ast)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	242 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	243 return Expression(testlist_ast, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	244 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	245 case single_input:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	246 if (TYPE(CHILD(n, 0)) == NEWLINE) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	247 stmts = asdl_seq_new(1, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	248 if (!stmts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	249 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	250 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	251 arena));
41579 7a4f174df844 Handle a couple of uncaught errors. This should be backported Neal Norwitz <nnorwitz@gmail.com> parents: 41578 diff changeset	252 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	253 goto error;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	254 return Interactive(stmts, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	255 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	256 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	257 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	258 num = num_stmts(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	259 stmts = asdl_seq_new(num, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	260 if (!stmts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	261 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	262 if (num == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	263 s = ast_for_stmt(&c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	264 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	265 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	266 asdl_seq_SET(stmts, 0, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	267 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	268 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	269 /* 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	270 REQ(n, simple_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	271 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	272 if (TYPE(CHILD(n, i)) == NEWLINE)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	273 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	274 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	275 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	276 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	277 asdl_seq_SET(stmts, i / 2, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	278 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	279 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	280
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	281 return Interactive(stmts, arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	282 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	283 default:
41578 bc6a0fe32351 Actually raise an exception before calling ast_error_finish. Georg Brandl <georg@python.org> parents: 41215 diff changeset	284 PyErr_Format(PyExc_SystemError,
bc6a0fe32351 Actually raise an exception before calling ast_error_finish. Georg Brandl <georg@python.org> parents: 41215 diff changeset	285 "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	286 goto error;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	287 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	288 error:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	289 ast_error_finish(filename);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	290 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	291 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	292
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	293 /* 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	294 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	295
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	296 static operator_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	297 get_operator(const node *n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	298 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	299 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	300 case VBAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	301 return BitOr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	302 case CIRCUMFLEX:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	303 return BitXor;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	304 case AMPER:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	305 return BitAnd;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	306 case LEFTSHIFT:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	307 return LShift;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	308 case RIGHTSHIFT:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	309 return RShift;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	310 case PLUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	311 return Add;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	312 case MINUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	313 return Sub;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	314 case STAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	315 return Mult;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	316 case SLASH:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	317 return Div;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	318 case DOUBLESLASH:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	319 return FloorDiv;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	320 case PERCENT:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	321 return Mod;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	322 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	323 return (operator_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	324 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	325 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	326
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	327 /* 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	328
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	329 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	330 (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	331 an appropriate syntax error and returns false.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	332 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	333
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	334 static int
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	335 set_context(struct compiling c, expr_ty e, expr_context_ty ctx, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	336 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	337 asdl_seq *s = NULL;
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	338 /* 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	339 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	340 */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	341 const char* expr_name = NULL;
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	342
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	343 /* 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	344 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	345 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	346 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	347 Consider restructuring so that augmented assignment uses
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	348 set_context(), too.
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	349 */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	350 assert(ctx != AugStore && ctx != AugLoad);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	351
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	352 switch (e->kind) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	353 case Attribute_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	354 if (ctx == Store &&
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	355 !strcmp(PyBytes_AS_STRING(e->v.Attribute.attr), "None")) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	356 return ast_error(n, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	357 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	358 e->v.Attribute.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	359 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	360 case Subscript_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	361 e->v.Subscript.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	362 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	363 case Name_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	364 if (ctx == Store &&
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	365 !strcmp(PyBytes_AS_STRING(e->v.Name.id), "None")) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	366 return ast_error(n, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	367 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	368 e->v.Name.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	369 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	370 case List_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	371 e->v.List.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	372 s = e->v.List.elts;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	373 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	374 case Tuple_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	375 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	376 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	377 e->v.Tuple.ctx = ctx;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	378 s = e->v.Tuple.elts;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	379 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	380 case Lambda_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	381 expr_name = "lambda";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	382 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	383 case Call_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	384 expr_name = "function call";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	385 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	386 case BoolOp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	387 case BinOp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	388 case UnaryOp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	389 expr_name = "operator";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	390 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	391 case GeneratorExp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	392 expr_name = "generator expression";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	393 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	394 case Yield_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	395 expr_name = "yield expression";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	396 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	397 case ListComp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	398 expr_name = "list comprehension";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	399 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	400 case Dict_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	401 case Num_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	402 case Str_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	403 expr_name = "literal";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	404 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	405 case Compare_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	406 expr_name = "comparison";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	407 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	408 case Repr_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	409 expr_name = "repr";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	410 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	411 case IfExp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	412 expr_name = "conditional expression";
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	413 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	414 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	415 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	416 "unexpected expression in assignment %d (line %d)",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	417 e->kind, e->lineno);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	418 return 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	419 }
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	420 /* Check for error string set by switch */
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	421 if (expr_name) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	422 char buf[300];
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	423 PyOS_snprintf(buf, sizeof(buf),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	424 "can't %s %s",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	425 ctx == Store ? "assign to" : "delete",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	426 expr_name);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	427 return ast_error(n, buf);
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	428 }
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	429
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	430 /* 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	431 context for all the contained elements.
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	432 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	433 if (s) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	434 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	435
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	436 for (i = 0; i < asdl_seq_LEN(s); i++) {
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	437 if (!set_context(c, (expr_ty)asdl_seq_GET(s, i), ctx, n))
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	438 return 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	439 }
35742 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 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	442 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	443
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	444 static operator_ty
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	445 ast_for_augassign(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	446 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	447 REQ(n, augassign);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	448 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	449 switch (STR(n)[0]) {
41215 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 Add;
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 return Sub;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	454 case '/':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	455 if (STR(n)[1] == '/')
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	456 return FloorDiv;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	457 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	458 return Div;
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 Mod;
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 LShift;
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 RShift;
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 BitAnd;
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 BitXor;
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 return BitOr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	471 case '*':
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	472 if (STR(n)[1] == '*')
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	473 return Pow;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	474 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	475 return Mult;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	476 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	477 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	478 return (operator_ty)0;
35742 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 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	481
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	482 static cmpop_ty
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	483 ast_for_comp_op(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	484 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	485 /* comp_op: '<'\|'>'\|'=='\|'>='\|'<='\|'<>'\|'!='\|'in'\|'not' 'in'\|'is'
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	486 \|'is' 'not'
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	487 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	488 REQ(n, comp_op);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	489 if (NCH(n) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	490 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	491 switch (TYPE(n)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	492 case LESS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	493 return Lt;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	494 case GREATER:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	495 return Gt;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	496 case EQEQUAL: /* == */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	497 return Eq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	498 case LESSEQUAL:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	499 return LtE;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	500 case GREATEREQUAL:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	501 return GtE;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	502 case NOTEQUAL:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	503 return NotEq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	504 case NAME:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	505 if (strcmp(STR(n), "in") == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	506 return In;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	507 if (strcmp(STR(n), "is") == 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	508 return Is;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	509 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	510 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	511 STR(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	512 return (cmpop_ty)0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	513 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	514 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	515 else if (NCH(n) == 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	516 /* handle "not in" and "is not" */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	517 switch (TYPE(CHILD(n, 0))) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	518 case NAME:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	519 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	520 return NotIn;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	521 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	522 return IsNot;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	523 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	524 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	525 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	526 return (cmpop_ty)0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	527 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	528 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	529 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	530 NCH(n));
37604 c732f66c913f Convert 0 to their respective enum types. Convert Martin v. Löwis <martin@v.loewis.de> parents: 37597 diff changeset	531 return (cmpop_ty)0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	532 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	533
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	534 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	535 seq_for_testlist(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	536 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	537 /* testlist: test (',' test)* [','] */
35759 d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	538 asdl_seq *seq;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	539 expr_ty expression;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations. Armin Rigo <arigo@tunes.org> parents: 35748 diff changeset	540 int i;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	541 assert(TYPE(n) == testlist \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	542 TYPE(n) == listmaker \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	543 TYPE(n) == testlist_gexp \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	544 TYPE(n) == testlist_safe \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	545 TYPE(n) == testlist1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	546
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	547 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	548 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	549 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	550
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	551 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	552 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	553
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	554 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	555 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	556 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	557
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	558 assert(i / 2 < seq->size);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	559 asdl_seq_SET(seq, i / 2, expression);
35742 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 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	562 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	563
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	564 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	565 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	566 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	567 int i, len = (NCH(n) + 1) / 2;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	568 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	569 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	570 if (!args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	571 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	572
39872 b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). Neal Norwitz <nnorwitz@gmail.com> parents: 39779 diff changeset	573 /* 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	574 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	575 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	576 REQ(n, fplist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	577 for (i = 0; i < len; i++) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	578 const node fpdef_node = CHILD(n, 2i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	579 const node *child;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	580 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	581 set_name:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	582 /* 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	583 child = CHILD(fpdef_node, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	584 if (TYPE(child) == NAME) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	585 if (!strcmp(STR(child), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	586 ast_error(child, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	587 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	588 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	589 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	590 child->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	591 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	592 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	593 assert(TYPE(fpdef_node) == fpdef);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	594 /* 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	595 child = CHILD(fpdef_node, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	596 assert(TYPE(child) == fplist);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	597 /* 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	598 if (NCH(child) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	599 fpdef_node = CHILD(child, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	600 assert(TYPE(fpdef_node) == fpdef);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	601 goto set_name;
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 arg = compiler_complex_args(c, child);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	604 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	605 asdl_seq_SET(args, i, arg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	606 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	607
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	608 result = Tuple(args, Store, LINENO(n), n->n_col_offset, c->c_arena);
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	609 if (!set_context(c, result, Store, n))
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	610 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	611 return result;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	612 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	613
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	614
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	615 /* Create AST for argument list. */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	616
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	617 static arguments_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	618 ast_for_arguments(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	619 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	620 /* parameters: '(' [varargslist] ')'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	621 varargslist: (fpdef ['=' test] ',')* ('' NAME [',' '*' NAME]
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	622 \| '*' NAME) \| fpdef ['=' test] (',' fpdef ['=' test]) [',']
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	623 */
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	624 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	625 asdl_seq args, defaults;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	626 identifier vararg = NULL, kwarg = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	627 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	628
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	629 if (TYPE(n) == parameters) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	630 if (NCH(n) == 2) /* () as argument list */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	631 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	632 n = CHILD(n, 1);
35742 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 REQ(n, varargslist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	635
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	636 /* first count the number of normal args & defaults */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	637 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	638 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	639 if (TYPE(ch) == fpdef)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	640 n_args++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	641 if (TYPE(ch) == EQUAL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	642 n_defaults++;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	643 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	644 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	645 if (!args && n_args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	646 return NULL; /* Don't need to goto error; no objects allocated */
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	647 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	648 if (!defaults && n_defaults)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	649 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	650
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	651 /* fpdef: NAME \| '(' fplist ')'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	652 fplist: fpdef (',' fpdef)* [',']
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	653 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	654 i = 0;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	655 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	656 k = 0; /* index for args */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	657 while (i < NCH(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	658 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	659 switch (TYPE(ch)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	660 case fpdef:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	661 handle_fpdef:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	662 /* 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	663 anything other than EQUAL or a comma? */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	664 /* 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	665 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	666 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	667 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	668 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	669 assert(defaults != NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	670 asdl_seq_SET(defaults, j++, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	671 i += 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	672 found_default = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	673 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	674 else if (found_default) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	675 ast_error(n,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	676 "non-default argument follows default argument");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	677 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	678 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	679 if (NCH(ch) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	680 ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	681 /* 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	682 if (NCH(ch) != 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	683 /* We have complex arguments, setup for unpacking. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	684 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	685 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	686 goto error;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	687 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	688 /* 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	689 /* 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	690 unpacking mixed in. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	691 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	692 assert(TYPE(ch) == fpdef);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	693 goto handle_fpdef;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	694 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	695 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	696 if (TYPE(CHILD(ch, 0)) == NAME) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	697 expr_ty name;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	698 if (!strcmp(STR(CHILD(ch, 0)), "None")) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	699 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	700 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	701 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	702 name = Name(NEW_IDENTIFIER(CHILD(ch, 0)),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	703 Param, LINENO(ch), ch->n_col_offset,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	704 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	705 if (!name)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	706 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	707 asdl_seq_SET(args, k++, name);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	708
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	709 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	710 i += 2; /* the name and the comma */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	711 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	712 case STAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	713 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	714 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	715 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	716 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	717 vararg = NEW_IDENTIFIER(CHILD(n, i+1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	718 i += 3;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	719 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	720 case DOUBLESTAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	721 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	722 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	723 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	724 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	725 kwarg = NEW_IDENTIFIER(CHILD(n, i+1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	726 i += 3;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	727 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	728 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	729 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	730 "unexpected node in varargslist: %d @ %d",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	731 TYPE(ch), i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	732 goto error;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	733 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	734 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	735
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	736 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	737
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	738 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	739 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	740 Py_XDECREF(kwarg);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	741 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	742 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	743
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	744 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	745 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	746 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	747 expr_ty e;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	748 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	749 int lineno, col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	750 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	751
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	752 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	753
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	754 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	755 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	756
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	757 id = NEW_IDENTIFIER(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	758 if (!id)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	759 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	760 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	761 if (!e)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	762 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	763
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	764 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	765 id = NEW_IDENTIFIER(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	766 if (!id)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	767 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	768 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	769 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	770 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	771 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	772
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	773 return e;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	774 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	775
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	776 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	777 ast_for_decorator(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	778 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	779 /* decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	780 expr_ty d = NULL;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	781 expr_ty name_expr;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	782
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	783 REQ(n, decorator);
36418 a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	784 REQ(CHILD(n, 0), AT);
a625e8876407 Improved handling of syntax errors. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36242 diff changeset	785 REQ(RCHILD(n, -1), NEWLINE);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	786
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	787 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	788 if (!name_expr)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	789 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	790
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	791 if (NCH(n) == 3) { /* No arguments */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	792 d = name_expr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	793 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	794 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	795 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	796 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	797 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	798 if (!d)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	799 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	800 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	801 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	802 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	803 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	804 if (!d)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	805 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	806 name_expr = NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	807 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	808
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	809 return d;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	810 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	811
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	812 static asdl_seq*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	813 ast_for_decorators(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	814 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	815 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	816 expr_ty d;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	817 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	818
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	819 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	820 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	821 if (!decorator_seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	822 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	823
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	824 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	825 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	826 if (!d)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	827 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	828 asdl_seq_SET(decorator_seq, i, d);
35742 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 return decorator_seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	831 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	832
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	833 static stmt_ty
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	834 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	835 {
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	836 /* funcdef: 'def' NAME parameters ':' suite */
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	837 identifier name;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	838 arguments_ty args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	839 asdl_seq *body;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	840 int name_i = 1;
35742 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 REQ(n, funcdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	843
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	844 name = NEW_IDENTIFIER(CHILD(n, name_i));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	845 if (!name)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	846 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	847 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	848 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	849 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	850 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	851 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	852 if (!args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	853 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	854 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	855 if (!body)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	856 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	857
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37235 diff changeset	858 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	859 n->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	860 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	861
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	862 static stmt_ty
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	863 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	864 {
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	865 /* decorated: decorators (classdef \| funcdef) */
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	866 stmt_ty thing = NULL;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	867 asdl_seq *decorator_seq = NULL;
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 REQ(n, decorated);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	870
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	871 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	872 if (!decorator_seq)
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	873 return NULL;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	874
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	875 assert(TYPE(CHILD(n, 1)) == funcdef \|\|
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	876 TYPE(CHILD(n, 1)) == classdef);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	877
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	878 if (TYPE(CHILD(n, 1)) == funcdef) {
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	879 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	880 } 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	881 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	882 }
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	883 /* 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	884 function's line number */
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	885 if (thing) {
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	886 thing->lineno = LINENO(n);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	887 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	888 }
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	889 return thing;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	890 }
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	891
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	892 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	893 ast_for_lambdef(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	894 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	895 /* lambdef: 'lambda' [varargslist] ':' test */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	896 arguments_ty args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	897 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	898
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	899 if (NCH(n) == 3) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	900 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	901 if (!args)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	902 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	903 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	904 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	905 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	906 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	907 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	908 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	909 if (!args)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	910 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	911 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	912 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	913 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	914 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	915
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	916 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	917 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	918
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	919 static expr_ty
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	920 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	921 {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	922 /* 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	923 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	924
36676 67c74efad8c2 Fix old not-reading-pep-308-right artifact. Thomas Wouters <thomas@python.org> parents: 36670 diff changeset	925 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	926 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	927 if (!body)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	928 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	929 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	930 if (!expression)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	931 return NULL;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	932 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	933 if (!orelse)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	934 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	935 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	936 c->c_arena);
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	937 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	938
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	939 /* 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	940 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	941 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	942 */
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	943
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	944 /* 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	945
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	946 Helper for ast_for_listcomp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	947 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	948
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	949 static int
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	950 count_list_fors(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	951 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	952 int n_fors = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	953 node *ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	954
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	955 count_list_for:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	956 n_fors++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	957 REQ(ch, list_for);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	958 if (NCH(ch) == 5)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	959 ch = CHILD(ch, 4);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	960 else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	961 return n_fors;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	962 count_list_iter:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	963 REQ(ch, list_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	964 ch = CHILD(ch, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	965 if (TYPE(ch) == list_for)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	966 goto count_list_for;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	967 else if (TYPE(ch) == list_if) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	968 if (NCH(ch) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	969 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	970 goto count_list_iter;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	971 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	972 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	973 return n_fors;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	974 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	975
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	976 /* Should never be reached */
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	977 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	978 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	979 }
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 /* 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	982
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	983 Helper for ast_for_listcomp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	984 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	985
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	986 static int
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	987 count_list_ifs(struct compiling c, const node n)
35742 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 int n_ifs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	990
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	991 count_list_iter:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	992 REQ(n, list_iter);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	993 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	994 return n_ifs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	995 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	996 REQ(n, list_if);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	997 n_ifs++;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	998 if (NCH(n) == 2)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	999 return n_ifs;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1000 n = CHILD(n, 2);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1001 goto count_list_iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1002 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1003
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1004 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1005 ast_for_listcomp(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1006 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1007 /* listmaker: test ( list_for \| (',' test)* [','] )
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1008 list_for: 'for' exprlist 'in' testlist_safe [list_iter]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1009 list_iter: list_for \| list_if
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1010 list_if: 'if' test [list_iter]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1011 testlist_safe: test [(',' test)+ [',']]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1012 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1013 expr_ty elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1014 asdl_seq *listcomps;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1015 int i, n_fors;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1016 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1017
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1018 REQ(n, listmaker);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1019 assert(NCH(n) > 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1020
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1021 elt = ast_for_expr(c, CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1022 if (!elt)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1023 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1024
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	1025 n_fors = count_list_fors(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1026 if (n_fors == -1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1027 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1028
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	1029 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	1030 if (!listcomps)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1031 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	1032
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1033 ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1034 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	1035 comprehension_ty lc;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1036 asdl_seq *t;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1037 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1038 node *for_ch;
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 REQ(ch, list_for);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1041
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1042 for_ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1043 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	1044 if (!t)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1045 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1046 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	1047 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1048 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1049
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1050 /* 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	1051 [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	1052 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1053 if (NCH(for_ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1054 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	1055 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1056 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1057 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	1058 c->c_arena),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1059 expression, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1060 if (!lc)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1061 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1062
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1063 if (NCH(ch) == 5) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1064 int j, n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1065 asdl_seq *ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1066 expr_ty list_for_expr;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1067
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1068 ch = CHILD(ch, 4);
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	1069 n_ifs = count_list_ifs(c, ch);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1070 if (n_ifs == -1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1071 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1072
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1073 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	1074 if (!ifs)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1075 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1076
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1077 for (j = 0; j < n_ifs; j++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1078 REQ(ch, list_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1079 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1080 REQ(ch, list_if);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1081
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1082 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	1083 if (!list_for_expr)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1084 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1085
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1086 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	1087 if (NCH(ch) == 3)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1088 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1089 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1090 /* 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	1091 if (TYPE(ch) == list_iter)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1092 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1093 lc->ifs = ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1094 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1095 asdl_seq_SET(listcomps, i, lc);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1096 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1097
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1098 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	1099 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1100
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1101 /* 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	1102
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1103 Helper for ast_for_genexp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1104 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1105
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1106 static int
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	1107 count_gen_fors(struct compiling c, const node n)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1108 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1109 int n_fors = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1110 node *ch = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1111
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1112 count_gen_for:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1113 n_fors++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1114 REQ(ch, gen_for);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1115 if (NCH(ch) == 5)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1116 ch = CHILD(ch, 4);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1117 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1118 return n_fors;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1119 count_gen_iter:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1120 REQ(ch, gen_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1121 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1122 if (TYPE(ch) == gen_for)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1123 goto count_gen_for;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1124 else if (TYPE(ch) == gen_if) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1125 if (NCH(ch) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1126 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1127 goto count_gen_iter;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1128 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1129 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1130 return n_fors;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1131 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1132
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1133 /* Should never be reached */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1134 PyErr_SetString(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1135 "logic error in count_gen_fors");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1136 return -1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1137 }
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 /* 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	1140
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1141 Helper for ast_for_genexp().
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1142 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1143
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1144 static int
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	1145 count_gen_ifs(struct compiling c, const node n)
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 int n_ifs = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1148
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1149 while (1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1150 REQ(n, gen_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1151 if (TYPE(CHILD(n, 0)) == gen_for)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1152 return n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1153 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1154 REQ(n, gen_if);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1155 n_ifs++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1156 if (NCH(n) == 2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1157 return n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1158 n = CHILD(n, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1159 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1160 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1161
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	1162 /* TODO(jhylton): Combine with list comprehension code? */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1163 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1164 ast_for_genexp(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1165 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1166 /* testlist_gexp: test ( gen_for \| (',' test)* [','] )
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1167 argument: [test '='] test [gen_for] # Really [keyword '='] test */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1168 expr_ty elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1169 asdl_seq *genexps;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1170 int i, n_fors;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1171 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1172
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1173 assert(TYPE(n) == (testlist_gexp) \|\| TYPE(n) == (argument));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1174 assert(NCH(n) > 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1175
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1176 elt = ast_for_expr(c, CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1177 if (!elt)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1178 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1179
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	1180 n_fors = count_gen_fors(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1181 if (n_fors == -1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1182 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	1183
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1184 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	1185 if (!genexps)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1186 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	1187
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1188 ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1189 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	1190 comprehension_ty ge;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1191 asdl_seq *t;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1192 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1193 node *for_ch;
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 REQ(ch, gen_for);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1196
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1197 for_ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1198 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	1199 if (!t)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1200 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1201 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	1202 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1203 return NULL;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36001 diff changeset	1204
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1205 /* 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	1206 (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	1207 if (NCH(for_ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1208 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	1209 NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1210 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1211 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	1212 c->c_arena),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1213 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	1214
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1215 if (!ge)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1216 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	1217
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1218 if (NCH(ch) == 5) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1219 int j, n_ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1220 asdl_seq *ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1221
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1222 ch = CHILD(ch, 4);
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	1223 n_ifs = count_gen_ifs(c, ch);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1224 if (n_ifs == -1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1225 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	1226
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1227 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	1228 if (!ifs)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1229 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	1230
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1231 for (j = 0; j < n_ifs; j++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1232 REQ(ch, gen_iter);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1233 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1234 REQ(ch, gen_if);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1235
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1236 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	1237 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1238 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1239 asdl_seq_SET(ifs, j, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1240 if (NCH(ch) == 3)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1241 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1242 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1243 /* 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	1244 if (TYPE(ch) == gen_iter)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1245 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1246 ge->ifs = ifs;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1247 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1248 asdl_seq_SET(genexps, i, ge);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1249 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1250
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	1251 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	1252 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1253
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1254 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1255 ast_for_atom(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1256 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1257 /* atom: '(' [yield_expr\|testlist_gexp] ')' \| '[' [listmaker] ']'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1258 \| '{' [dictmaker] '}' \| '`' testlist '`' \| NAME \| NUMBER \| STRING+
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 node *ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1261
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1262 switch (TYPE(ch)) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1263 case NAME:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1264 /* 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	1265 changed. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1266 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	1267 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1268 case STRING: {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1269 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	1270 if (!str) {
44572 db5e01c33eb7 Make Python compile with --disable-unicode. Georg Brandl <georg@python.org> parents: 43997 diff changeset	1271 #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	1272 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	1273 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	1274 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	1275 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	1276 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	1277 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	1278 char buf[128];
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	1279 s = PyBytes_AsString(errstr);
42308 6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1280 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	1281 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	1282 } else {
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors. Guido van Rossum <guido@python.org> parents: 41974 diff changeset	1283 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	1284 }
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_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	1286 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	1287 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	1288 }
44572 db5e01c33eb7 Make Python compile with --disable-unicode. Georg Brandl <georg@python.org> parents: 43997 diff changeset	1289 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1290 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	1291 }
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1292 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1293 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	1294 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1295 case NUMBER: {
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	1296 PyObject *pynum = parsenumber(c, STR(ch));
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1297 if (!pynum)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1298 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	1299
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1300 PyArena_AddPyObject(c->c_arena, pynum);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1301 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	1302 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1303 case LPAR: /* some parenthesized expressions */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1304 ch = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1305
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1306 if (TYPE(ch) == RPAR)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1307 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	1308
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1309 if (TYPE(ch) == yield_expr)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1310 return ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1311
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1312 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	1313 return ast_for_genexp(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1314
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1315 return ast_for_testlist_gexp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1316 case LSQB: /* list (or list comprehension) */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1317 ch = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1318
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1319 if (TYPE(ch) == RSQB)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1320 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	1321
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1322 REQ(ch, listmaker);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1323 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	1324 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	1325 if (!elts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1326 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	1327
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1328 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	1329 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1330 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1331 return ast_for_listcomp(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1332 case LBRACE: {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1333 /* dictmaker: test ':' test (',' test ':' test)* [','] */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1334 int i, size;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1335 asdl_seq keys, values;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1336
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1337 ch = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1338 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	1339 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	1340 if (!keys)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1341 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1342
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1343 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	1344 if (!values)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1345 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1346
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1347 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	1348 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1349
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1350 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	1351 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1352 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	1353
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1354 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	1355
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1356 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	1357 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1358 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	1359
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1360 asdl_seq_SET(values, i / 4, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1361 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1362 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	1363 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1364 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	1365 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	1366 if (Py_Py3kWarningFlag) {
47516 f3df51b60dc2 change Py3k backquote warning to a SyntaxWarning and add a test Benjamin Peterson <benjamin@python.org> parents: 47294 diff changeset	1367 if (PyErr_WarnExplicit(PyExc_SyntaxWarning,
46075 84bb7701efba Make Py3k warnings consistent w.r.t. punctuation; also respect the Georg Brandl <georg@python.org> parents: 45905 diff changeset	1368 "backquote not supported in 3.x; use repr()",
43997 17479a09ec7c Added filename to compiling struct based on Martin's suggestion. Christian Heimes <christian@cheimes.de> parents: 43985 diff changeset	1369 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	1370 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	1371 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	1372 }
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	1373 }
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	1374 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	1375 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1376 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	1377
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1378 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	1379 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1380 default:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1381 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	1382 return NULL;
35742 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 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1385
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1386 static slice_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1387 ast_for_slice(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1388 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1389 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1390 expr_ty lower = NULL, upper = NULL, step = NULL;
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 REQ(n, subscript);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1393
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1394 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1395 subscript: '.' '.' '.' \| test \| [test] ':' [test] [sliceop]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1396 sliceop: ':' [test]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1397 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1398 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1399 if (TYPE(ch) == DOT)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1400 return Ellipsis(c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1401
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1402 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	1403 /* '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	1404 other vars */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1405 step = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1406 if (!step)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1407 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1408
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1409 return Index(step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1410 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1411
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1412 if (TYPE(ch) == test) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1413 lower = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1414 if (!lower)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1415 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1416 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1417
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1418 /* 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	1419 if (TYPE(ch) == COLON) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1420 if (NCH(n) > 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1421 node *n2 = CHILD(n, 1);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1422
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1423 if (TYPE(n2) == test) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1424 upper = ast_for_expr(c, n2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1425 if (!upper)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1426 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1427 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1428 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1429 } else if (NCH(n) > 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1430 node *n2 = CHILD(n, 2);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1431
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1432 if (TYPE(n2) == test) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1433 upper = ast_for_expr(c, n2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1434 if (!upper)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1435 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1436 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1437 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1438
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1439 ch = CHILD(n, NCH(n) - 1);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1440 if (TYPE(ch) == sliceop) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1441 if (NCH(ch) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1442 /* No expression, so step is None */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1443 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1444 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	1445 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	1446 if (!step)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1447 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1448 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1449 ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1450 if (TYPE(ch) == test) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1451 step = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1452 if (!step)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1453 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1454 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1455 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1456 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1457
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	1458 return Slice(lower, upper, step, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1459 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1460
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1461 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1462 ast_for_binop(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1463 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1464 /* Must account for a sequence of expressions.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1465 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	1466 BinOp(BinOp(A, op, B), op, C).
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1467 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1468
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1469 int i, nops;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1470 expr_ty expr1, expr2, result;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1471 operator_ty newoperator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1472
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1473 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	1474 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1475 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1476
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1477 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	1478 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1479 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1480
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1481 newoperator = get_operator(CHILD(n, 1));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1482 if (!newoperator)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1483 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1484
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1485 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	1486 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1487 if (!result)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1488 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1489
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1490 nops = (NCH(n) - 1) / 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1491 for (i = 1; i < nops; i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1492 expr_ty tmp_result, tmp;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1493 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	1494
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1495 newoperator = get_operator(next_oper);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1496 if (!newoperator)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1497 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1498
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1499 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	1500 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1501 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1502
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1503 tmp_result = BinOp(result, newoperator, tmp,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1504 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	1505 c->c_arena);
43470 995677219a65 Fix Coverity #158: Check the correct variable. Neal Norwitz <nnorwitz@gmail.com> parents: 42459 diff changeset	1506 if (!tmp_result)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1507 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1508 result = tmp_result;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1509 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1510 return result;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1511 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1512
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1513 static expr_ty
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1514 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	1515 {
36686 8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1516 /* trailer: '(' [arglist] ')' \| '[' subscriptlist ']' \| '.' NAME
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1517 subscriptlist: subscript (',' subscript)* [',']
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1518 subscript: '.' '.' '.' \| test \| [test] ':' [test] [sliceop]
8611f39cd82b Fix parsing of subscriptlist. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36682 diff changeset	1519 */
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1520 REQ(n, trailer);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1521 if (TYPE(CHILD(n, 0)) == LPAR) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1522 if (NCH(n) == 2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1523 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	1524 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1525 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1526 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	1527 }
36679 e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1528 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	1529 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	1530 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	1531 }
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36676 diff changeset	1532 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1533 REQ(CHILD(n, 0), LSQB);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1534 REQ(CHILD(n, 2), RSQB);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1535 n = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1536 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1537 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	1538 if (!slc)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1539 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1540 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	1541 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1542 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1543 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1544 /* 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	1545 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	1546 no slice features.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1547 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1548 int j;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1549 slice_ty slc;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1550 expr_ty e;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1551 bool simple = true;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1552 asdl_seq slices, elts;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1553 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	1554 if (!slices)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1555 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1556 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	1557 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	1558 if (!slc)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1559 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1560 if (slc->kind != Index_kind)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1561 simple = false;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1562 asdl_seq_SET(slices, j / 2, slc);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1563 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1564 if (!simple) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1565 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	1566 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	1567 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1568 /* 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	1569 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	1570 if (!elts)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1571 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1572 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	1573 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	1574 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	1575 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	1576 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1577 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	1578 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1579 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1580 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	1581 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	1582 }
35799 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 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1585
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1586 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	1587 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	1588 {
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1589 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	1590 expr_ty expression;
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1591
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1592 /* 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	1593 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	1594 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	1595 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	1596 (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	1597 PyLongObject.
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1598 */
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1599 if (TYPE(CHILD(n, 0)) == MINUS &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1600 NCH(n) == 2 &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1601 TYPE((pfactor = CHILD(n, 1))) == factor &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1602 NCH(pfactor) == 1 &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1603 TYPE((ppower = CHILD(pfactor, 0))) == power &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1604 NCH(ppower) == 1 &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1605 TYPE((patom = CHILD(ppower, 0))) == atom &&
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1606 TYPE((pnum = CHILD(patom, 0))) == NUMBER) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1607 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	1608 if (s == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1609 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1610 s[0] = '-';
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1611 strcpy(s + 1, STR(pnum));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1612 PyObject_FREE(STR(pnum));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1613 STR(pnum) = s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1614 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	1615 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1616
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1617 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	1618 if (!expression)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1619 return NULL;
39038 64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1620
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1621 switch (TYPE(CHILD(n, 0))) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1622 case PLUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1623 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	1624 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1625 case MINUS:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1626 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	1627 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1628 case TILDE:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1629 return UnaryOp(Invert, expression, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1630 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	1631 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1632 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	1633 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	1634 return NULL;
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1635 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1636
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 39037 diff changeset	1637 static expr_ty
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1638 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	1639 {
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1640 /* power: atom trailer* ('*' factor)
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1641 */
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1642 int i;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1643 expr_ty e, tmp;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1644 REQ(n, power);
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1645 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	1646 if (!e)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1647 return NULL;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1648 if (NCH(n) == 1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1649 return e;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1650 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	1651 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1652 if (TYPE(ch) != trailer)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1653 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1654 tmp = ast_for_trailer(c, ch, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1655 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1656 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1657 tmp->lineno = e->lineno;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1658 tmp->col_offset = e->col_offset;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1659 e = tmp;
35799 842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1660 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1661 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	1662 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	1663 if (!f)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1664 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1665 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	1666 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1667 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1668 e = tmp;
35799 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 return e;
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1671 }
842caa245917 Refactor code for translating "power" nodes. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35798 diff changeset	1672
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1673 /* 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	1674 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1675
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1676 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1677 ast_for_expr(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1678 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1679 /* 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	1680 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	1681 or_test: and_test ('or' and_test)*
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1682 and_test: not_test ('and' not_test)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1683 not_test: 'not' not_test \| comparison
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1684 comparison: expr (comp_op expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1685 expr: xor_expr ('\|' xor_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1686 xor_expr: and_expr ('^' and_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1687 and_expr: shift_expr ('&' shift_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1688 shift_expr: arith_expr (('<<'\|'>>') arith_expr)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1689 arith_expr: term (('+'\|'-') term)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1690 term: factor ((''\|'/'\|'%'\|'//') factor)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1691 factor: ('+'\|'-'\|'~') factor \| power
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1692 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	1693
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1694 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	1695 to explicitly allow:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1696 [ 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	1697 (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	1698
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36444 diff changeset	1699 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	1700 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	1701
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1702 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1703
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1704 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1705 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1706
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1707 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1708 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1709 case test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1710 case old_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1711 if (TYPE(CHILD(n, 0)) == lambdef \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1712 TYPE(CHILD(n, 0)) == old_lambdef)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1713 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	1714 else if (NCH(n) > 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1715 return ast_for_ifexpr(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1716 /* Fallthrough */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1717 case or_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1718 case and_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1719 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1720 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1721 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1722 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1723 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	1724 if (!seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1725 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1726 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	1727 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	1728 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1729 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1730 asdl_seq_SET(seq, i / 2, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1731 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1732 if (!strcmp(STR(CHILD(n, 1)), "and"))
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1733 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	1734 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1735 assert(!strcmp(STR(CHILD(n, 1)), "or"));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1736 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	1737 case not_test:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1738 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1739 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1740 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1741 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1742 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1743 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	1744 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1745 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1746
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1747 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	1748 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1749 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1750 case comparison:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1751 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1752 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1753 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1754 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1755 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1756 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1757 asdl_int_seq *ops;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1758 asdl_seq *cmps;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1759 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	1760 if (!ops)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1761 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1762 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	1763 if (!cmps) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1764 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1765 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1766 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	1767 cmpop_ty newoperator;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1768
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	1769 newoperator = ast_for_comp_op(c, CHILD(n, i));
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1770 if (!newoperator) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1771 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1772 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1773
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1774 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	1775 if (!expression) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1776 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1777 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1778
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1779 asdl_seq_SET(ops, i / 2, newoperator);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1780 asdl_seq_SET(cmps, i / 2, expression);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1781 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1782 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	1783 if (!expression) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1784 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1785 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1786
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1787 return Compare(expression, ops, cmps, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1788 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1789 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1790 break;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1791
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1792 /* 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	1793 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	1794 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	1795 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1796 case expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1797 case xor_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1798 case and_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1799 case shift_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1800 case arith_expr:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1801 case term:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1802 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1803 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1804 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1805 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1806 return ast_for_binop(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1807 case yield_expr: {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1808 expr_ty exp = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1809 if (NCH(n) == 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1810 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	1811 if (!exp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1812 return NULL;
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 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	1815 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1816 case factor:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1817 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1818 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1819 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1820 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1821 return ast_for_factor(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1822 case power:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1823 return ast_for_power(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1824 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1825 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	1826 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1827 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1828 /* 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	1829 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1830 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1831
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1832 static expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1833 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	1834 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1835 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1836 arglist: (argument ',')* (argument [',']\| '' test [',' '*' test]
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1837 \| '**' test)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1838 argument: [test '='] test [gen_for] # Really [keyword '='] test
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1839 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1840
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1841 int i, nargs, nkeywords, ngens;
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1842 asdl_seq *args;
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	1843 asdl_seq *keywords;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1844 expr_ty vararg = NULL, kwarg = NULL;
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 REQ(n, arglist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1847
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1848 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1849 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1850 ngens = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1851 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	1852 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1853 if (TYPE(ch) == argument) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1854 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1855 nargs++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1856 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	1857 ngens++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1858 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1859 nkeywords++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1860 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1861 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1862 if (ngens > 1 \|\| (ngens && (nargs \|\| nkeywords))) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1863 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	1864 "if not sole argument");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1865 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1866 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1867
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1868 if (nargs + nkeywords + ngens > 255) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1869 ast_error(n, "more than 255 arguments");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1870 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1871 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1872
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	1873 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	1874 if (!args)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1875 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	1876 keywords = asdl_seq_new(nkeywords, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1877 if (!keywords)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1878 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1879 nargs = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1880 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1881 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	1882 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1883 if (TYPE(ch) == argument) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1884 expr_ty e;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1885 if (NCH(ch) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1886 if (nkeywords) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1887 ast_error(CHILD(ch, 0),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1888 "non-keyword arg after keyword arg");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1889 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1890 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1891 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	1892 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1893 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1894 asdl_seq_SET(args, nargs++, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1895 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1896 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	1897 e = ast_for_genexp(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1898 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1899 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1900 asdl_seq_SET(args, nargs++, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1901 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1902 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1903 keyword_ty kw;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1904 identifier key;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1905
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1906 /* 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	1907 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	1908 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1909 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1910 /* 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	1911 * 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	1912 * 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	1913 * then is very confusing.
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1914 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1915 if (e->kind == Lambda_kind) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1916 ast_error(CHILD(ch, 0),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1917 "lambda cannot contain assignment");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1918 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1919 } else if (e->kind != Name_kind) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1920 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	1921 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1922 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1923 key = e->v.Name.id;
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	1924 if (!strcmp(PyBytes_AS_STRING(key), "None")) {
41974 c8b0e3b8b456 Disallow function calls like foo(None=1). Georg Brandl <georg@python.org> parents: 41773 diff changeset	1925 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	1926 return NULL;
c8b0e3b8b456 Disallow function calls like foo(None=1). Georg Brandl <georg@python.org> parents: 41773 diff changeset	1927 }
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1928 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	1929 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1930 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1931 kw = keyword(key, e, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1932 if (!kw)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1933 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1934 asdl_seq_SET(keywords, nkeywords++, kw);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1935 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1936 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1937 else if (TYPE(ch) == STAR) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1938 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	1939 if (!vararg)
ff3e9aeaa692 Issue#2238: some syntax errors from args or kwargs expressions Amaury Forgeot d'Arc <amauryfa@gmail.com>* parents: 45447 diff changeset	1940 return NULL;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1941 i++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1942 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1943 else if (TYPE(ch) == DOUBLESTAR) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1944 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	1945 if (!kwarg)
ff3e9aeaa692 Issue#2238: some syntax errors from args or kwargs expressions Amaury Forgeot d'Arc <amauryfa@gmail.com>* parents: 45447 diff changeset	1946 return NULL;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1947 i++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1948 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1949 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1950
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1951 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	1952 func->col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1953 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1954
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1955 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	1956 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	1957 {
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1958 /* 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	1959 /* 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	1960 /* 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	1961 /* testlist1: test (',' test)* */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1962 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	1963 if (TYPE(n) == testlist_gexp) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1964 if (NCH(n) > 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1965 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	1966 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1967 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1968 assert(TYPE(n) == testlist \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1969 TYPE(n) == testlist_safe \|\|
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1970 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	1971 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1972 if (NCH(n) == 1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1973 return ast_for_expr(c, CHILD(n, 0));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1974 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1975 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	1976 if (!tmp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1977 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	1978 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	1979 }
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1980 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1981
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1982 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	1983 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	1984 {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1985 /* 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	1986 /* 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	1987 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	1988 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	1989 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	1990 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	1991 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1992
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1993 /* 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	1994 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	1995 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	1996 {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	1997 /* 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	1998 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	1999 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	2000 if (NCH(n) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2001 expr_ty base;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2002 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	2003 if (!bases)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2004 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2005 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	2006 if (!base)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2007 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2008 asdl_seq_SET(bases, 0, base);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2009 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	2010 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2011
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2012 return seq_for_testlist(c, n);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2013 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2014
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2015 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2016 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	2017 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2018 REQ(n, expr_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2019 /* 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	2020 \| ('=' (yield_expr\|testlist))*)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2021 testlist: test (',' test)* [',']
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2022 augassign: '+=' \| '-=' \| '*=' \| '/=' \| '%=' \| '&=' \| '\|=' \| '^='
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2023 \| '<<=' \| '>>=' \| '**=' \| '//='
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2024 test: ... here starts the operator precendence dance
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2025 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2026
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2027 if (NCH(n) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2028 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	2029 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2030 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2031
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2032 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	2033 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2034 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	2035 expr_ty expr1, expr2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2036 operator_ty newoperator;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2037 node *ch = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2038
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2039 expr1 = ast_for_testlist(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2040 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2041 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2042 /* 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	2043 switch (expr1->kind) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2044 case GeneratorExp_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2045 ast_error(ch, "augmented assignment to generator "
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2046 "expression not possible");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2047 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2048 case Yield_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2049 ast_error(ch, "augmented assignment to yield "
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2050 "expression not possible");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2051 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2052 case Name_kind: {
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	2053 const char *var_name = PyBytes_AS_STRING(expr1->v.Name.id);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2054 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	2055 ast_error(ch, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2056 return NULL;
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 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2059 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2060 case Attribute_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2061 case Subscript_kind:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2062 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2063 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2064 ast_error(ch, "illegal expression for augmented "
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2065 "assignment");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2066 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2067 }
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	2068 if(!set_context(c, expr1, Store, ch))
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2069 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2070
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2071 ch = CHILD(n, 2);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2072 if (TYPE(ch) == testlist)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2073 expr2 = ast_for_testlist(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2074 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2075 expr2 = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2076 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2077 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2078
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	2079 newoperator = ast_for_augassign(c, CHILD(n, 1));
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2080 if (!newoperator)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2081 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2082
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2083 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	2084 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2085 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2086 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2087 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2088 asdl_seq *targets;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2089 node *value;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2090 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2091
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2092 /* a normal assignment */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2093 REQ(CHILD(n, 1), EQUAL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2094 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	2095 if (!targets)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2096 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2097 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	2098 expr_ty e;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2099 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2100 if (TYPE(ch) == yield_expr) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2101 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	2102 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2103 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2104 e = ast_for_testlist(c, ch);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2105
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2106 /* set context to assign */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2107 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2108 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2109
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	2110 if (!set_context(c, e, Store, CHILD(n, i)))
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2111 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2112
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2113 asdl_seq_SET(targets, i / 2, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2114 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2115 value = CHILD(n, NCH(n) - 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2116 if (TYPE(value) == testlist)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2117 expression = ast_for_testlist(c, value);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2118 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2119 expression = ast_for_expr(c, value);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2120 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2121 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2122 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	2123 c->c_arena);
35742 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 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2126
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2127 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2128 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	2129 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2130 /* print_stmt: 'print' ( [ test (',' test)* [','] ]
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2131 \| '>>' test [ (',' test)+ [','] ] )
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2132 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2133 expr_ty dest = NULL, expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2134 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2135 bool nl;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2136 int i, j, start = 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2137
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2138 REQ(n, print_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2139 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	2140 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	2141 if (!dest)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2142 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2143 start = 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2144 }
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	2145 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	2146 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2147 return NULL;
36718 45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation. Jeremy Hylton <jeremy@alum.mit.edu> parents: 36712 diff changeset	2148 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	2149 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	2150 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2151 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2152 asdl_seq_SET(seq, j, expression);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2153 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2154 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	2155 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	2156 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2157
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2158 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	2159 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	2160 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2161 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2162 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2163 expr_ty e;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2164
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2165 REQ(n, exprlist);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2166
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	2167 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	2168 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2169 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2170 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	2171 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	2172 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2173 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2174 asdl_seq_SET(seq, i / 2, e);
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	2175 if (context && !set_context(c, e, context, CHILD(n, i)))
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2176 return NULL;
35742 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 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2179 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2180
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2181 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2182 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	2183 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2184 asdl_seq *expr_list;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2185
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2186 /* del_stmt: 'del' exprlist */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2187 REQ(n, del_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2188
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2189 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	2190 if (!expr_list)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2191 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	2192 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	2193 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2194
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2195 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2196 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	2197 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2198 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2199 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	2200 \| yield_stmt
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2201 break_stmt: 'break'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2202 continue_stmt: 'continue'
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2203 return_stmt: 'return' [testlist]
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2204 yield_stmt: yield_expr
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2205 yield_expr: 'yield' testlist
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2206 raise_stmt: 'raise' [test [',' test [',' test]]]
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 node *ch;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2209
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2210 REQ(n, flow_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2211 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2212 switch (TYPE(ch)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2213 case break_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2214 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	2215 case continue_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2216 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	2217 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	2218 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	2219 if (!exp)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2220 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2221 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	2222 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2223 case return_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2224 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2225 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	2226 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2227 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	2228 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2229 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2230 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	2231 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2232 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2233 case raise_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2234 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2235 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	2236 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2237 else if (NCH(ch) == 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2238 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	2239 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2240 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2241 return Raise(expression, NULL, NULL, LINENO(n),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2242 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2243 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2244 else if (NCH(ch) == 4) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2245 expr_ty expr1, expr2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2246
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2247 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	2248 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2249 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2250 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	2251 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2252 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2253
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2254 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	2255 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2256 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2257 else if (NCH(ch) == 6) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2258 expr_ty expr1, expr2, expr3;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2259
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2260 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	2261 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2262 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2263 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	2264 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2265 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2266 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	2267 if (!expr3)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2268 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2269
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2270 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	2271 c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2272 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2273 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2274 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2275 "unexpected flow_stmt: %d", TYPE(ch));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2276 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2277 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2278
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2279 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	2280 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2281 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2282
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2283 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	2284 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	2285 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2286 /*
36742 658f8ff2a442 Make 'as' an actual keyword when with's future statement is used. Not Thomas Wouters <thomas@python.org> parents: 36718 diff changeset	2287 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	2288 dotted_as_name: dotted_name ['as' NAME]
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2289 dotted_name: NAME ('.' NAME)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2290 */
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	2291 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	2292
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2293 loop:
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2294 switch (TYPE(n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2295 case import_as_name:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2296 str = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2297 if (NCH(n) == 3) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2298 str = NEW_IDENTIFIER(CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2299 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2300 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	2301 case dotted_as_name:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2302 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2303 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2304 goto loop;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2305 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2306 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2307 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	2308 if (!a)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2309 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2310 assert(!a->asname);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2311 a->asname = NEW_IDENTIFIER(CHILD(n, 2));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2312 return a;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2313 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2314 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2315 case dotted_name:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2316 if (NCH(n) == 1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2317 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	2318 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2319 /* 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	2320 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2321 size_t len;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2322 char *s;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2323
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2324 len = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2325 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	2326 /* 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	2327 len += strlen(STR(CHILD(n, i))) + 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2328 len--; /* the last name doesn't have a dot */
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	2329 str = PyBytes_FromStringAndSize(NULL, len);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2330 if (!str)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2331 return NULL;
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	2332 s = PyBytes_AS_STRING(str);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2333 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2334 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2335 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	2336 char *sch = STR(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2337 strcpy(s, STR(CHILD(n, i)));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2338 s += strlen(sch);
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 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2341 --s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2342 *s = '\0';
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	2343 PyBytes_InternInPlace(&str);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2344 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2345 return alias(str, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2346 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2347 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2348 case STAR:
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	2349 str = PyBytes_InternFromString("*");
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2350 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2351 return alias(str, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2352 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2353 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2354 "unexpected import name: %d", TYPE(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2355 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2356 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2357
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2358 PyErr_SetString(PyExc_SystemError, "unhandled import name condition");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2359 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2360 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2361
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2362 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2363 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	2364 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2365 /*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2366 import_stmt: import_name \| import_from
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2367 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	2368 import_from: 'from' ('.'* dotted_name \| '.') 'import'
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2369 ('*' \| '(' import_as_names ')' \| import_as_names)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2370 */
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2371 int lineno;
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2372 int col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2373 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2374 asdl_seq *aliases;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2375
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2376 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	2377 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	2378 col_offset = n->n_col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2379 n = CHILD(n, 0);
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2380 if (TYPE(n) == import_name) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2381 n = CHILD(n, 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2382 REQ(n, dotted_as_names);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2383 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	2384 if (!aliases)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2385 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2386 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	2387 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	2388 if (!import_alias)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2389 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2390 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	2391 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2392 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	2393 }
36682 52cbc447e1c9 And some more cleanup. Thomas Wouters <thomas@python.org> parents: 36681 diff changeset	2394 else if (TYPE(n) == import_from) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2395 int n_children;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2396 int idx, ndots = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2397 alias_ty mod = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2398 identifier modname;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2399
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36695 diff changeset	2400 /* 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	2401 optional module name */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2402 for (idx = 1; idx < NCH(n); idx++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2403 if (TYPE(CHILD(n, idx)) == dotted_name) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2404 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	2405 idx++;
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 } else if (TYPE(CHILD(n, idx)) != DOT) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2408 break;
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 ndots++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2411 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2412 idx++; /* skip over the 'import' keyword */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2413 switch (TYPE(CHILD(n, idx))) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2414 case STAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2415 /* from ... import * */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2416 n = CHILD(n, idx);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2417 n_children = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2418 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2419 case LPAR:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2420 /* from ... import (x, y, z) */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2421 n = CHILD(n, idx + 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2422 n_children = NCH(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2423 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2424 case import_as_names:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2425 /* from ... import x, y, z */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2426 n = CHILD(n, idx);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2427 n_children = NCH(n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2428 if (n_children % 2 == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2429 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	2430 " surrounding parentheses");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2431 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2432 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2433 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2434 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2435 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	2436 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2437 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2438
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2439 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	2440 if (!aliases)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2441 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2442
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2443 /* 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	2444 if (TYPE(n) == STAR) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2445 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	2446 if (!import_alias)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2447 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2448 asdl_seq_SET(aliases, 0, import_alias);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2449 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2450 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2451 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	2452 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	2453 if (!import_alias)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2454 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2455 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	2456 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2457 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2458 if (mod != NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2459 modname = mod->name;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2460 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2461 modname = new_identifier("", c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2462 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	2463 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2464 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2465 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2466 "unknown import statement: starts with command '%s'",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2467 STR(CHILD(n, 0)));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2468 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2469 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2470
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2471 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2472 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	2473 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2474 /* global_stmt: 'global' NAME (',' NAME)* */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2475 identifier name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2476 asdl_seq *s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2477 int i;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2478
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2479 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	2480 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	2481 if (!s)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2482 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2483 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	2484 name = NEW_IDENTIFIER(CHILD(n, i));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2485 if (!name)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2486 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2487 asdl_seq_SET(s, i / 2, name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2488 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2489 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	2490 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2491
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2492 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2493 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	2494 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2495 expr_ty expr1, globals = NULL, locals = NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2496 int n_children = NCH(n);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2497 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	2498 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2499 "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	2500 n_children);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2501 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2502 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2503
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2504 /* exec_stmt: 'exec' expr ['in' test [',' test]] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2505 REQ(n, exec_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2506 expr1 = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2507 if (!expr1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2508 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2509 if (n_children >= 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2510 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	2511 if (!globals)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2512 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2513 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2514 if (n_children == 6) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2515 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	2516 if (!locals)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2517 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2518 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2519
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2520 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	2521 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2522 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2523
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2524 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2525 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	2526 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2527 /* assert_stmt: 'assert' test [',' test] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2528 REQ(n, assert_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2529 if (NCH(n) == 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2530 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	2531 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2532 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2533 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	2534 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2535 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2536 else if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2537 expr_ty expr1, expr2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2538
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2539 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	2540 if (!expr1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2541 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2542 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	2543 if (!expr2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2544 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2545
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2546 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	2547 }
35870 f531c05cd240 Convert all internal errors from Exception to SystemError Neal Norwitz <nnorwitz@gmail.com> parents: 35868 diff changeset	2548 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2549 "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	2550 NCH(n));
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2551 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2552 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2553
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2554 static asdl_seq *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2555 ast_for_suite(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2556 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2557 /* 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	2558 asdl_seq *seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2559 stmt_ty s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2560 int i, total, num, end, pos = 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2561 node *ch;
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 REQ(n, suite);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2564
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2565 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	2566 seq = asdl_seq_new(total, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2567 if (!seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2568 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2569 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	2570 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2571 /* simple_stmt always ends with a NEWLINE,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2572 and may have a trailing SEMI
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2573 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2574 end = NCH(n) - 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2575 if (TYPE(CHILD(n, end - 1)) == SEMI)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2576 end--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2577 /* loop by 2 to skip semi-colons */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2578 for (i = 0; i < end; i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2579 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2580 s = ast_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2581 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2582 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2583 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2584 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2585 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2586 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2587 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	2588 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2589 REQ(ch, stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2590 num = num_stmts(ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2591 if (num == 1) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2592 /* 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	2593 s = ast_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2594 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2595 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2596 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2597 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2598 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2599 int j;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2600 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2601 REQ(ch, simple_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2602 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	2603 /* statement terminates with a semi-colon ';' */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2604 if (NCH(CHILD(ch, j)) == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2605 assert((j + 1) == NCH(ch));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2606 break;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2607 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2608 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	2609 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2610 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2611 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2612 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2613 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2614 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2615 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2616 assert(pos == seq->size);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2617 return seq;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2618 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2619
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2620 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2621 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	2622 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2623 /* if_stmt: 'if' test ':' suite ('elif' test ':' suite)*
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2624 ['else' ':' suite]
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 char *s;
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 REQ(n, if_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2629
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2630 if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2631 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2632 asdl_seq *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2633
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2634 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	2635 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2636 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2637 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	2638 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2639 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2640
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2641 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	2642 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2643 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2644
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2645 s = STR(CHILD(n, 4));
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2646 /* 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	2647 's' for el_s_e, or
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2648 'i' for el_i_f
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2649 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2650 if (s[2] == 's') {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2651 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2652 asdl_seq seq1, seq2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2653
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2654 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	2655 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2656 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2657 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	2658 if (!seq1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2659 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2660 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	2661 if (!seq2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2662 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2663
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2664 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	2665 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2666 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2667 else if (s[2] == 'i') {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2668 int i, n_elif, has_else = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2669 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2670 asdl_seq *suite_seq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2671 asdl_seq *orelse = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2672 n_elif = NCH(n) - 4;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2673 /* 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	2674 not fourth, child from the end. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2675 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	2676 && 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	2677 has_else = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2678 n_elif -= 3;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2679 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2680 n_elif /= 4;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2681
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2682 if (has_else) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2683 asdl_seq *suite_seq2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2684
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2685 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	2686 if (!orelse)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2687 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2688 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	2689 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2690 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2691 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	2692 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2693 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2694 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	2695 if (!suite_seq2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2696 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2697
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2698 asdl_seq_SET(orelse, 0,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2699 If(expression, suite_seq, suite_seq2,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2700 LINENO(CHILD(n, NCH(n) - 6)),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2701 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	2702 c->c_arena));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2703 /* 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	2704 n_elif--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2705 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2706
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2707 for (i = 0; i < n_elif; i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2708 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	2709 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	2710 if (!newobj)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2711 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2712 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	2713 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2714 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2715 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	2716 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2717 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2718
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2719 asdl_seq_SET(newobj, 0,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2720 If(expression, suite_seq, orelse,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2721 LINENO(CHILD(n, off)),
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2722 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	2723 orelse = newobj;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2724 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2725 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	2726 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2727 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2728 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	2729 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2730 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2731 return If(expression, suite_seq, orelse,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2732 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	2733 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2734
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2735 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2736 "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	2737 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2738 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2739
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2740 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2741 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	2742 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2743 /* while_stmt: 'while' test ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2744 REQ(n, while_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2745
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2746 if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2747 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2748 asdl_seq *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2749
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2750 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	2751 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2752 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2753 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	2754 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2755 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2756 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	2757 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2758 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2759 else if (NCH(n) == 7) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2760 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2761 asdl_seq seq1, seq2;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2762
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2763 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	2764 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2765 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2766 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	2767 if (!seq1)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2768 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2769 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	2770 if (!seq2)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2771 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2772
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2773 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	2774 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2775 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2776
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2777 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2778 "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	2779 NCH(n));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2780 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2781 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2782
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2783 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2784 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	2785 {
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2786 asdl_seq _target, seq = NULL, *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2787 expr_ty expression;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2788 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	2789 const node *node_target;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2790 /* for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2791 REQ(n, for_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2792
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2793 if (NCH(n) == 9) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2794 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	2795 if (!seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2796 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2797 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2798
39067 7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. Neal Norwitz <nnorwitz@gmail.com> parents: 39038 diff changeset	2799 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	2800 _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	2801 if (!_target)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2802 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	2803 /* 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	2804 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	2805 if (NCH(node_target) == 1)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2806 target = (expr_ty)asdl_seq_GET(_target, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2807 else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2808 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	2809
35798 857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 35771 diff changeset	2810 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	2811 if (!expression)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2812 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2813 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	2814 if (!suite_seq)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2815 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2816
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37235 diff changeset	2817 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	2818 c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2819 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2820
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2821 static excepthandler_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2822 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	2823 {
41773 f19e631be101 Backport PEP 3110's new 'except' syntax to 2.6. Collin Winter <collinw@gmail.com> parents: 41579 diff changeset	2824 /* except_clause: 'except' [test [(',' \| 'as') test]] */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2825 REQ(exc, except_clause);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2826 REQ(body, suite);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2827
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2828 if (NCH(exc) == 1) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2829 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	2830 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2831 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2832
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46118 diff changeset	2833 return ExceptHandler(NULL, NULL, suite_seq, LINENO(exc),
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2834 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2835 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2836 else if (NCH(exc) == 2) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2837 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2838 asdl_seq *suite_seq;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2839
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2840 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	2841 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2842 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2843 suite_seq = ast_for_suite(c, body);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2844 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2845 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2846
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46118 diff changeset	2847 return ExceptHandler(expression, NULL, suite_seq, LINENO(exc),
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2848 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2849 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2850 else if (NCH(exc) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2851 asdl_seq *suite_seq;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2852 expr_ty expression;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2853 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	2854 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2855 return NULL;
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	2856 if (!set_context(c, e, Store, CHILD(exc, 3)))
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2857 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2858 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	2859 if (!expression)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2860 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2861 suite_seq = ast_for_suite(c, body);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2862 if (!suite_seq)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2863 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2864
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46118 diff changeset	2865 return ExceptHandler(expression, e, suite_seq, LINENO(exc),
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2866 exc->n_col_offset, c->c_arena);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2867 }
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2868
de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2869 PyErr_Format(PyExc_SystemError,
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2870 "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	2871 NCH(exc));
36072 de16a85c3b4c Cleanup a bit and make things more consistent. Neal Norwitz <nnorwitz@gmail.com> parents: 36066 diff changeset	2872 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2873 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2874
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2875 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2876 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	2877 {
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2878 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	2879 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	2880 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	2881
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2882 REQ(n, try_stmt);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2883
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2884 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	2885 if (body == NULL)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2886 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	2887
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2888 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	2889 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	2890 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	2891 /* we can assume it's an "else",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2892 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	2893 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	2894 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	2895 if (orelse == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2896 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2897 n_except--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2898 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2899
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2900 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	2901 if (finally == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2902 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2903 n_except--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2904 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2905 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2906 /* we can assume it's an "else",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2907 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	2908 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	2909 if (orelse == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2910 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2911 n_except--;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2912 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2913 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2914 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	2915 ast_error(n, "malformed 'try' statement");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2916 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2917 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2918
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2919 if (n_except > 0) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2920 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2921 stmt_ty except_st;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2922 /* 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	2923 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	2924 if (handlers == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2925 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	2926
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2927 for (i = 0; i < n_except; i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2928 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	2929 CHILD(n, 5 + i * 3));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2930 if (!e)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2931 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2932 asdl_seq_SET(handlers, i, e);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2933 }
36066 719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2934
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2935 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	2936 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2937 if (!finally)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2938 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	2939
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2940 /* 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	2941 TryFinally to emulate try ... except ... finally */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2942 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	2943 if (body == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2944 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2945 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	2946 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2947
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally Neal Norwitz <nnorwitz@gmail.com> parents: 36065 diff changeset	2948 /* 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	2949 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	2950 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	2951 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2952
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2953 static expr_ty
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2954 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	2955 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2956 REQ(n, with_var);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2957 return ast_for_expr(c, CHILD(n, 1));
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2958 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2959
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2960 /* with_stmt: 'with' test [ with_var ] ':' suite */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2961 static stmt_ty
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2962 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	2963 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2964 expr_ty context_expr, optional_vars = NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2965 int suite_index = 3; /* skip 'with', test, and ':' */
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2966 asdl_seq *suite_seq;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2967
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2968 assert(TYPE(n) == with_stmt);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2969 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	2970 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	2971 return NULL;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2972 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	2973 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	2974
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2975 if (!optional_vars) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2976 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2977 }
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	2978 if (!set_context(c, optional_vars, Store, n)) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2979 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2980 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2981 suite_index = 4;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2982 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2983
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2984 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	2985 if (!suite_seq) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	2986 return NULL;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2987 }
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36780 diff changeset	2988 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	2989 n->n_col_offset, c->c_arena);
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2990 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36686 diff changeset	2991
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2992 static stmt_ty
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	2993 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	2994 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2995 /* classdef: 'class' NAME ['(' testlist ')'] ':' suite */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2996 asdl_seq bases, s;
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 REQ(n, classdef);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2999
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3000 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	3001 ast_error(n, "assignment to None");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3002 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3003 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3004
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3005 if (NCH(n) == 4) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3006 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	3007 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3008 return NULL;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3009 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	3010 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	3011 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3012 /* check for empty base list */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3013 if (TYPE(CHILD(n,3)) == RPAR) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3014 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	3015 if (!s)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3016 return NULL;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3017 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	3018 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	3019 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3020
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3021 /* 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	3022 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	3023 if (!bases)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3024 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3025
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3026 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	3027 if (!s)
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3028 return NULL;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3029 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	3030 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	3031 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3032
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3033 static stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3034 ast_for_stmt(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3035 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3036 if (TYPE(n) == stmt) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3037 assert(NCH(n) == 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3038 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3039 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3040 if (TYPE(n) == simple_stmt) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3041 assert(num_stmts(n) == 1);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3042 n = CHILD(n, 0);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3043 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3044 if (TYPE(n) == small_stmt) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3045 REQ(n, small_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3046 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3047 /* 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	3048 \| 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	3049 \| assert_stmt
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3050 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3051 switch (TYPE(n)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3052 case expr_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3053 return ast_for_expr_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3054 case print_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3055 return ast_for_print_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3056 case del_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3057 return ast_for_del_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3058 case pass_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3059 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	3060 case flow_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3061 return ast_for_flow_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3062 case import_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3063 return ast_for_import_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3064 case global_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3065 return ast_for_global_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3066 case exec_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3067 return ast_for_exec_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3068 case assert_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3069 return ast_for_assert_stmt(c, n);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3070 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3071 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3072 "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	3073 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3074 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3075 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3076 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3077 else {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3078 /* 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	3079 \| funcdef \| classdef \| decorated
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3080 */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3081 node *ch = CHILD(n, 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3082 REQ(n, compound_stmt);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3083 switch (TYPE(ch)) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3084 case if_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3085 return ast_for_if_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3086 case while_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3087 return ast_for_while_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3088 case for_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3089 return ast_for_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3090 case try_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3091 return ast_for_try_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3092 case with_stmt:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3093 return ast_for_with_stmt(c, ch);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3094 case funcdef:
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3095 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	3096 case classdef:
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3097 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	3098 case decorated:
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 44747 diff changeset	3099 return ast_for_decorated(c, ch);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3100 default:
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3101 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3102 "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	3103 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3104 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3105 }
35742 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 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3108
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3109 static PyObject *
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	3110 parsenumber(struct compiling c, const char s)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3111 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3112 const char *end;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3113 long x;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3114 double dx;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3115 #ifndef WITHOUT_COMPLEX
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	3116 Py_complex complex;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3117 int imflag;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3118 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3119
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3120 errno = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3121 end = s + strlen(s) - 1;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3122 #ifndef WITHOUT_COMPLEX
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3123 imflag = end == 'j' \|\| end == 'J';
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3124 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3125 if (end == 'l' \|\| end == 'L')
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3126 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	3127 if (s[0] == '0') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3128 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	3129 if (x < 0 && errno == 0) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3130 return PyLong_FromString((char *)s,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3131 (char **)0,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3132 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3133 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3134 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3135 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3136 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	3137 if (*end == '\0') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3138 if (errno != 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3139 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	3140 return PyInt_FromLong(x);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3141 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3142 /* XXX Huge floats may silently fail */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3143 #ifndef WITHOUT_COMPLEX
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3144 if (imflag) {
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	3145 complex.real = 0.;
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3146 PyFPE_START_PROTECT("atof", return 0)
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	3147 complex.imag = PyOS_ascii_atof(s);
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	3148 PyFPE_END_PROTECT(complex)
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	3149 return PyComplex_FromCComplex(complex);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3150 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3151 else
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3152 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3153 {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3154 PyFPE_START_PROTECT("atof", return 0)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3155 dx = PyOS_ascii_atof(s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3156 PyFPE_END_PROTECT(dx)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3157 return PyFloat_FromDouble(dx);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3158 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3159 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3160
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3161 static PyObject *
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	3162 decode_utf8(struct compiling c, const char sPtr, const char end, char* encoding)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3163 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3164 #ifndef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3165 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	3166 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3167 #else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3168 PyObject u, v;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3169 char s, t;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3170 t = s = (char )sPtr;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3171 /* 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	3172 while (s < end && (*s & 0x80)) s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3173 *sPtr = s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3174 u = PyUnicode_DecodeUTF8(t, s - t, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3175 if (u == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3176 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3177 v = PyUnicode_AsEncodedString(u, encoding, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3178 Py_DECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3179 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3180 #endif
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3181 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3182
42459 dbfc3cf1522d Place #ifdef Py_USING_UNICODE around decode_unicode(). Georg Brandl <georg@python.org> parents: 42308 diff changeset	3183 #ifdef Py_USING_UNICODE
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3184 static PyObject *
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	3185 decode_unicode(struct compiling c, const char s, size_t len, int rawmode, const char *encoding)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3186 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3187 PyObject v, u;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3188 char *buf;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3189 char *p;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3190 const char *end;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3191 if (encoding == NULL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3192 buf = (char *)s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3193 u = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3194 } 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	3195 buf = (char *)s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3196 u = NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3197 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3198 /* "\XX" may become "\u005c\uHHLL" (12 bytes) */
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	3199 u = PyBytes_FromStringAndSize((char )NULL, len 4);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3200 if (u == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3201 return NULL;
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	3202 p = buf = PyBytes_AsString(u);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3203 end = s + len;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3204 while (s < end) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3205 if (*s == '\\') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3206 p++ = s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3207 if (*s & 0x80) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3208 strcpy(p, "u005c");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3209 p += 5;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3210 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3211 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3212 if (s & 0x80) { / XXX inefficient */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3213 PyObject *w;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3214 char *r;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3215 Py_ssize_t rn, i;
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	3216 w = decode_utf8(c, &s, end, "utf-16-be");
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3217 if (w == NULL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3218 Py_DECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3219 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3220 }
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	3221 r = PyBytes_AsString(w);
4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	3222 rn = PyBytes_Size(w);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3223 assert(rn % 2 == 0);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3224 for (i = 0; i < rn; i += 2) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3225 sprintf(p, "\\u%02x%02x",
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3226 r[i + 0] & 0xFF,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3227 r[i + 1] & 0xFF);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3228 p += 6;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3229 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3230 Py_DECREF(w);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3231 } else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3232 p++ = s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3233 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3234 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3235 len = p - buf;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3236 s = buf;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3237 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3238 if (rawmode)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3239 v = PyUnicode_DecodeRawUnicodeEscape(s, len, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3240 else
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3241 v = PyUnicode_DecodeUnicodeEscape(s, len, NULL);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3242 Py_XDECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3243 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3244 }
42459 dbfc3cf1522d Place #ifdef Py_USING_UNICODE around decode_unicode(). Georg Brandl <georg@python.org> parents: 42308 diff changeset	3245 #endif
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3246
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3247 /* 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	3248 * 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	3249 * 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	3250 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3251 static PyObject *
46118 c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	3252 parsestr(struct compiling c, const char s)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3253 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3254 size_t len;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3255 int quote = Py_CHARMASK(*s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3256 int rawmode = 0;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3257 int need_encoding;
46118 c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	3258 int unicode = c->c_future_unicode;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3259
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3260 if (isalpha(quote) \|\| quote == '_') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3261 if (quote == 'u' \|\| quote == 'U') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3262 quote = *++s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3263 unicode = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3264 }
44747 8da9ebf73026 Added bytes and b'' as aliases for str and '' Christian Heimes <christian@cheimes.de> parents: 44572 diff changeset	3265 if (quote == 'b' \|\| quote == 'B') {
8da9ebf73026 Added bytes and b'' as aliases for str and '' Christian Heimes <christian@cheimes.de> parents: 44572 diff changeset	3266 quote = *++s;
46118 c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	3267 unicode = 0;
44747 8da9ebf73026 Added bytes and b'' as aliases for str and '' Christian Heimes <christian@cheimes.de> parents: 44572 diff changeset	3268 }
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3269 if (quote == 'r' \|\| quote == 'R') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3270 quote = *++s;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3271 rawmode = 1;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3272 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3273 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3274 if (quote != '\'' && quote != '\"') {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3275 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3276 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3277 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3278 s++;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3279 len = strlen(s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3280 if (len > INT_MAX) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3281 PyErr_SetString(PyExc_OverflowError,
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3282 "string to parse is too long");
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3283 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3284 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3285 if (s[--len] != quote) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3286 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3287 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3288 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3289 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	3290 s += 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3291 len -= 2;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3292 if (s[--len] != quote \|\| s[--len] != quote) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3293 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3294 return NULL;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3295 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3296 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3297 #ifdef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3298 if (unicode \|\| Py_UnicodeFlag) {
46642 0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720) Benjamin Peterson <benjamin@python.org> parents: 46200 diff changeset	3299 return decode_unicode(c, s, len, rawmode, c->c_encoding);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3300 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3301 #endif
46118 c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	3302 need_encoding = (c->c_encoding != NULL &&
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	3303 strcmp(c->c_encoding, "utf-8") != 0 &&
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	3304 strcmp(c->c_encoding, "iso-8859-1") != 0);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3305 if (rawmode \|\| strchr(s, '\\') == NULL) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3306 if (need_encoding) {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3307 #ifndef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3308 /* 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	3309 encoding. */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3310 Py_FatalError(
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3311 "cannot deal with encodings in this build.");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3312 #else
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3313 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	3314 if (u == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3315 return NULL;
46118 c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	3316 v = PyUnicode_AsEncodedString(u, c->c_encoding, NULL);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3317 Py_DECREF(u);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3318 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3319 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3320 } else {
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	3321 return PyBytes_FromStringAndSize(s, len);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3322 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3323 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3324
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	3325 return PyBytes_DecodeEscape(s, len, NULL, unicode,
46118 c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	3326 need_encoding ? c->c_encoding : NULL);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3327 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3328
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3329 /* 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	3330 * 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	3331 * pasting the intermediate results together.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3332 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3333 static PyObject *
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3334 parsestrplus(struct compiling c, const node n)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3335 {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3336 PyObject *v;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3337 int i;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3338 REQ(CHILD(n, 0), STRING);
46118 c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	3339 if ((v = parsestr(c, STR(CHILD(n, 0)))) != NULL) {
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3340 /* String literal concatenation */
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3341 for (i = 1; i < NCH(n); i++) {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3342 PyObject *s;
46118 c78d3586c474 Patch #2477: Added from __future__ import unicode_literals Christian Heimes <christian@cheimes.de> parents: 46075 diff changeset	3343 s = parsestr(c, STR(CHILD(n, i)));
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3344 if (s == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3345 goto onError;
47294 4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	3346 if (PyBytes_Check(v) && PyBytes_Check(s)) {
4fe192d48960 Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46642 diff changeset	3347 PyBytes_ConcatAndDel(&v, s);
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3348 if (v == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3349 goto onError;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3350 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3351 #ifdef Py_USING_UNICODE
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3352 else {
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3353 PyObject *temp = PyUnicode_Concat(v, s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3354 Py_DECREF(s);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3355 Py_DECREF(v);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3356 v = temp;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3357 if (v == NULL)
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3358 goto onError;
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3359 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3360 #endif
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3361 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3362 }
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3363 return v;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3364
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3365 onError:
41215 72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3366 Py_XDECREF(v);
72da48d96257 Clean up formatting of this file. Jeremy Hylton <jeremy@alum.mit.edu> parents: 41205 diff changeset	3367 return NULL;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3368 }

Mercurial > cpython-lru_cache-weakref

annotate Python/ast.c @ 47516:f3df51b60dc2 legacy-trunk