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

annotate Python/ast.c @ 47860:80109d4044cd legacy-trunk

#3219 repeated keyword arguments aren't allowed in function calls anymore

author	Benjamin Peterson <benjamin@python.org>
date	Tue, 01 Jul 2008 19:34:52 +0000
parents	1c964ed35ef9
children	c0ab2bafb264

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

Mercurial > cpython-lru_cache-weakref

annotate Python/ast.c @ 47860:80109d4044cd legacy-trunk