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