Mercurial > cpython-lru_cache-weakref

annotate Python/ast.c @ 58707:76cf60e2d005 legacy-trunk

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