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

annotate Python/ast.c @ 58229:c2fdf25329ff legacy-trunk

Issue #2335: Backport set literals syntax from Python 3.x.

author	Alexandre Vassalotti <alexandre@peadrop.com>
date	Sat, 09 Jan 2010 23:35:54 +0000
parents	ed30bcffa146
children	edfed0e32ced

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

Mercurial > cpython-lru_cache-weakref

annotate Python/ast.c @ 58229:c2fdf25329ff legacy-trunk