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