Mercurial > cpython-lru_cache-weakref

annotate Python/ast.c @ 62743:2145593d108d legacy-trunk v2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move sections
author Benjamin Peterson <benjamin@python.org>
date Sat, 03 Jul 2010 13:57:30 +0000
parents cb1ab8e91581
children 549a40ca2074
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1 /*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2 * This file includes functions to transform a concrete syntax tree (CST) to
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3 * an abstract syntax tree (AST). The main function is PyAST_FromNode().
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
4 *
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
5 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
6 #include "Python.h"
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
7 #include "Python-ast.h"
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
8 #include "grammar.h"
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
9 #include "node.h"
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
10 #include "pyarena.h"
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
11 #include "ast.h"
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
12 #include "token.h"
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
13 #include "parsetok.h"
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
14 #include "graminit.h"
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
15
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
16 #include <assert.h>
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
17
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
18 /* Data structure used internally */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
19 struct compiling {
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
20 char *c_encoding; /* source encoding */
46118
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
21 int c_future_unicode; /* __future__ unicode literals flag */
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
22 PyArena *c_arena; /* arena for allocating memeory */
43997
17479a09ec7c Added filename to compiling struct based on Martin's suggestion.
Christian Heimes <christian@cheimes.de>
parents: 43985
diff changeset
23 const char *c_filename; /* filename */
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
24 };
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
25
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
26 static asdl_seq *seq_for_testlist(struct compiling *, const node *);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
27 static expr_ty ast_for_expr(struct compiling *, const node *);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
28 static stmt_ty ast_for_stmt(struct compiling *, const node *);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
29 static asdl_seq *ast_for_suite(struct compiling *, const node *);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
30 static asdl_seq *ast_for_exprlist(struct compiling *, const node *,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
31 expr_context_ty);
35798
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
32 static expr_ty ast_for_testlist(struct compiling *, const node *);
45447
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
33 static stmt_ty ast_for_classdef(struct compiling *, const node *, asdl_seq *);
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
34 static expr_ty ast_for_testlist_comp(struct compiling *, const node *);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
35
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
36 /* Note different signature for ast_for_call */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
37 static expr_ty ast_for_call(struct compiling *, const node *, expr_ty);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
38
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
39 static PyObject *parsenumber(struct compiling *, const char *);
46118
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
40 static PyObject *parsestr(struct compiling *, const char *);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
41 static PyObject *parsestrplus(struct compiling *, const node *n);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
42
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
43 #ifndef LINENO
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
44 #define LINENO(n) ((n)->n_lineno)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
45 #endif
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
46
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
47 #define COMP_GENEXP 0
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
48 #define COMP_SETCOMP 1
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
49
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
50 static identifier
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
51 new_identifier(const char* n, PyArena *arena) {
47527
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
52 PyObject* id = PyString_InternFromString(n);
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
53 if (id != NULL)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
54 PyArena_AddPyObject(arena, id);
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
55 return id;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
56 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
57
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
58 #define NEW_IDENTIFIER(n) new_identifier(STR(n), c->c_arena)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
59
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
60 /* This routine provides an invalid object for the syntax error.
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
61 The outermost routine must unpack this error and create the
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
62 proper object. We do this so that we don't have to pass
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
63 the filename to everything function.
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
64
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
65 XXX Maybe we should just pass the filename...
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
66 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
67
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
68 static int
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
69 ast_error(const node *n, const char *errstr)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
70 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
71 PyObject *u = Py_BuildValue("zi", errstr, LINENO(n));
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
72 if (!u)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
73 return 0;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
74 PyErr_SetObject(PyExc_SyntaxError, u);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
75 Py_DECREF(u);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
76 return 0;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
77 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
78
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
79 static void
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
80 ast_error_finish(const char *filename)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
81 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
82 PyObject *type, *value, *tback, *errstr, *loc, *tmp;
36231
d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits
Neal Norwitz <nnorwitz@gmail.com>
parents: 36224
diff changeset
83 long lineno;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
84
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
85 assert(PyErr_Occurred());
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
86 if (!PyErr_ExceptionMatches(PyExc_SyntaxError))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
87 return;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
88
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
89 PyErr_Fetch(&type, &value, &tback);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
90 errstr = PyTuple_GetItem(value, 0);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
91 if (!errstr)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
92 return;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
93 Py_INCREF(errstr);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
94 lineno = PyInt_AsLong(PyTuple_GetItem(value, 1));
36000
cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions).
Neal Norwitz <nnorwitz@gmail.com>
parents: 35990
diff changeset
95 if (lineno == -1) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
96 Py_DECREF(errstr);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
97 return;
36000
cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions).
Neal Norwitz <nnorwitz@gmail.com>
parents: 35990
diff changeset
98 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
99 Py_DECREF(value);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
100
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
101 loc = PyErr_ProgramText(filename, lineno);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
102 if (!loc) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
103 Py_INCREF(Py_None);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
104 loc = Py_None;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
105 }
36231
d3f4c467e439 Fix icc warnings: conversion from "long" to "int" may lose significant bits
Neal Norwitz <nnorwitz@gmail.com>
parents: 36224
diff changeset
106 tmp = Py_BuildValue("(zlOO)", filename, lineno, Py_None, loc);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
107 Py_DECREF(loc);
36000
cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions).
Neal Norwitz <nnorwitz@gmail.com>
parents: 35990
diff changeset
108 if (!tmp) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
109 Py_DECREF(errstr);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
110 return;
36000
cc3261597136 SF #1370197, memory leak - ast_error_finish (in error conditions).
Neal Norwitz <nnorwitz@gmail.com>
parents: 35990
diff changeset
111 }
38406
8f7c7aeac3a5 Replace Py_BuildValue("OO") by PyTuple_Pack.
Georg Brandl <georg@python.org>
parents: 38218
diff changeset
112 value = PyTuple_Pack(2, errstr, tmp);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
113 Py_DECREF(errstr);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
114 Py_DECREF(tmp);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
115 if (!value)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
116 return;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
117 PyErr_Restore(type, value, tback);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
118 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
119
47521
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
120 static int
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
121 ast_warn(struct compiling *c, const node *n, char *msg)
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
122 {
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
123 if (PyErr_WarnExplicit(PyExc_SyntaxWarning, msg, c->c_filename, LINENO(n),
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
124 NULL, NULL) < 0) {
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
125 /* if -Werr, change it to a SyntaxError */
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
126 if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_SyntaxWarning))
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
127 ast_error(n, msg);
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
128 return 0;
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
129 }
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
130 return 1;
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
131 }
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
132
47523
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
133 static int
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
134 forbidden_check(struct compiling *c, const node *n, const char *x)
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
135 {
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
136 if (!strcmp(x, "None"))
49696
2e0857b0fc67 check for assignment to __debug__ during AST generation
Benjamin Peterson <benjamin@python.org>
parents: 49584
diff changeset
137 return ast_error(n, "cannot assign to None");
2e0857b0fc67 check for assignment to __debug__ during AST generation
Benjamin Peterson <benjamin@python.org>
parents: 49584
diff changeset
138 if (!strcmp(x, "__debug__"))
2e0857b0fc67 check for assignment to __debug__ during AST generation
Benjamin Peterson <benjamin@python.org>
parents: 49584
diff changeset
139 return ast_error(n, "cannot assign to __debug__");
49584
6634530a04e0 give a py3k warning when 'nonlocal' is used as a variable name
Benjamin Peterson <benjamin@python.org>
parents: 48307
diff changeset
140 if (Py_Py3kWarningFlag) {
6634530a04e0 give a py3k warning when 'nonlocal' is used as a variable name
Benjamin Peterson <benjamin@python.org>
parents: 48307
diff changeset
141 if (!(strcmp(x, "True") && strcmp(x, "False")) &&
6634530a04e0 give a py3k warning when 'nonlocal' is used as a variable name
Benjamin Peterson <benjamin@python.org>
parents: 48307
diff changeset
142 !ast_warn(c, n, "assignment to True or False is forbidden in 3.x"))
6634530a04e0 give a py3k warning when 'nonlocal' is used as a variable name
Benjamin Peterson <benjamin@python.org>
parents: 48307
diff changeset
143 return 0;
6634530a04e0 give a py3k warning when 'nonlocal' is used as a variable name
Benjamin Peterson <benjamin@python.org>
parents: 48307
diff changeset
144 if (!strcmp(x, "nonlocal") &&
6634530a04e0 give a py3k warning when 'nonlocal' is used as a variable name
Benjamin Peterson <benjamin@python.org>
parents: 48307
diff changeset
145 !ast_warn(c, n, "nonlocal is a keyword in 3.x"))
6634530a04e0 give a py3k warning when 'nonlocal' is used as a variable name
Benjamin Peterson <benjamin@python.org>
parents: 48307
diff changeset
146 return 0;
6634530a04e0 give a py3k warning when 'nonlocal' is used as a variable name
Benjamin Peterson <benjamin@python.org>
parents: 48307
diff changeset
147 }
47523
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
148 return 1;
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
149 }
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
150
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
151 /* num_stmts() returns number of contained statements.
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
152
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
153 Use this routine to determine how big a sequence is needed for
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
154 the statements in a parse tree. Its raison d'etre is this bit of
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
155 grammar:
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
156
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
157 stmt: simple_stmt | compound_stmt
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
158 simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
159
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
160 A simple_stmt can contain multiple small_stmt elements joined
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
161 by semicolons. If the arg is a simple_stmt, the number of
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
162 small_stmt elements is returned.
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
163 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
164
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
165 static int
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
166 num_stmts(const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
167 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
168 int i, l;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
169 node *ch;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
170
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
171 switch (TYPE(n)) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
172 case single_input:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
173 if (TYPE(CHILD(n, 0)) == NEWLINE)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
174 return 0;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
175 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
176 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
177 case file_input:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
178 l = 0;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
179 for (i = 0; i < NCH(n); i++) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
180 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
181 if (TYPE(ch) == stmt)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
182 l += num_stmts(ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
183 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
184 return l;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
185 case stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
186 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
187 case compound_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
188 return 1;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
189 case simple_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
190 return NCH(n) / 2; /* Divide by 2 to remove count of semi-colons */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
191 case suite:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
192 if (NCH(n) == 1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
193 return num_stmts(CHILD(n, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
194 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
195 l = 0;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
196 for (i = 2; i < (NCH(n) - 1); i++)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
197 l += num_stmts(CHILD(n, i));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
198 return l;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
199 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
200 default: {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
201 char buf[128];
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
202
50830
e158c70511fe #4077: No need to append \n when calling Py_FatalError
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 50027
diff changeset
203 sprintf(buf, "Non-statement found: %d %d",
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
204 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
205 Py_FatalError(buf);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
206 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
207 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
208 assert(0);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
209 return 0;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
210 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
211
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
212 /* Transform the CST rooted at node * to the appropriate AST
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
213 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
214
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
215 mod_ty
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
216 PyAST_FromNode(const node *n, PyCompilerFlags *flags, const char *filename,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
217 PyArena *arena)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
218 {
36718
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36712
diff changeset
219 int i, j, k, num;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
220 asdl_seq *stmts = NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
221 stmt_ty s;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
222 node *ch;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
223 struct compiling c;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
224
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
225 if (flags && flags->cf_flags & PyCF_SOURCE_IS_UTF8) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
226 c.c_encoding = "utf-8";
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
227 if (TYPE(n) == encoding_decl) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
228 ast_error(n, "encoding declaration in Unicode string");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
229 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
230 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
231 } else if (TYPE(n) == encoding_decl) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
232 c.c_encoding = STR(n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
233 n = CHILD(n, 0);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
234 } else {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
235 c.c_encoding = NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
236 }
46118
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
237 c.c_future_unicode = flags && flags->cf_flags & CO_FUTURE_UNICODE_LITERALS;
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
238 c.c_arena = arena;
43997
17479a09ec7c Added filename to compiling struct based on Martin's suggestion.
Christian Heimes <christian@cheimes.de>
parents: 43985
diff changeset
239 c.c_filename = filename;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
240
36718
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36712
diff changeset
241 k = 0;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
242 switch (TYPE(n)) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
243 case file_input:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
244 stmts = asdl_seq_new(num_stmts(n), arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
245 if (!stmts)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
246 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
247 for (i = 0; i < NCH(n) - 1; i++) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
248 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
249 if (TYPE(ch) == NEWLINE)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
250 continue;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
251 REQ(ch, stmt);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
252 num = num_stmts(ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
253 if (num == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
254 s = ast_for_stmt(&c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
255 if (!s)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
256 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
257 asdl_seq_SET(stmts, k++, s);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
258 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
259 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
260 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
261 REQ(ch, simple_stmt);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
262 for (j = 0; j < num; j++) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
263 s = ast_for_stmt(&c, CHILD(ch, j * 2));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
264 if (!s)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
265 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
266 asdl_seq_SET(stmts, k++, s);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
267 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
268 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
269 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
270 return Module(stmts, arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
271 case eval_input: {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
272 expr_ty testlist_ast;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
273
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
274 /* XXX Why not comp_for here? */
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
275 testlist_ast = ast_for_testlist(&c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
276 if (!testlist_ast)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
277 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
278 return Expression(testlist_ast, arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
279 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
280 case single_input:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
281 if (TYPE(CHILD(n, 0)) == NEWLINE) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
282 stmts = asdl_seq_new(1, arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
283 if (!stmts)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
284 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
285 asdl_seq_SET(stmts, 0, Pass(n->n_lineno, n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
286 arena));
41579
7a4f174df844 Handle a couple of uncaught errors. This should be backported
Neal Norwitz <nnorwitz@gmail.com>
parents: 41578
diff changeset
287 if (!asdl_seq_GET(stmts, 0))
7a4f174df844 Handle a couple of uncaught errors. This should be backported
Neal Norwitz <nnorwitz@gmail.com>
parents: 41578
diff changeset
288 goto error;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
289 return Interactive(stmts, arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
290 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
291 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
292 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
293 num = num_stmts(n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
294 stmts = asdl_seq_new(num, arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
295 if (!stmts)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
296 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
297 if (num == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
298 s = ast_for_stmt(&c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
299 if (!s)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
300 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
301 asdl_seq_SET(stmts, 0, s);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
302 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
303 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
304 /* Only a simple_stmt can contain multiple statements. */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
305 REQ(n, simple_stmt);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
306 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
307 if (TYPE(CHILD(n, i)) == NEWLINE)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
308 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
309 s = ast_for_stmt(&c, CHILD(n, i));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
310 if (!s)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
311 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
312 asdl_seq_SET(stmts, i / 2, s);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
313 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
314 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
315
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
316 return Interactive(stmts, arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
317 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
318 default:
41578
bc6a0fe32351 Actually raise an exception before calling ast_error_finish.
Georg Brandl <georg@python.org>
parents: 41215
diff changeset
319 PyErr_Format(PyExc_SystemError,
bc6a0fe32351 Actually raise an exception before calling ast_error_finish.
Georg Brandl <georg@python.org>
parents: 41215
diff changeset
320 "invalid node %d for PyAST_FromNode", TYPE(n));
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
321 goto error;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
322 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
323 error:
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
324 ast_error_finish(filename);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
325 return NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
326 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
327
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
328 /* Return the AST repr. of the operator represented as syntax (|, ^, etc.)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
329 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
330
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
331 static operator_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
332 get_operator(const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
333 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
334 switch (TYPE(n)) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
335 case VBAR:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
336 return BitOr;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
337 case CIRCUMFLEX:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
338 return BitXor;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
339 case AMPER:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
340 return BitAnd;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
341 case LEFTSHIFT:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
342 return LShift;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
343 case RIGHTSHIFT:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
344 return RShift;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
345 case PLUS:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
346 return Add;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
347 case MINUS:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
348 return Sub;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
349 case STAR:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
350 return Mult;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
351 case SLASH:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
352 return Div;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
353 case DOUBLESLASH:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
354 return FloorDiv;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
355 case PERCENT:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
356 return Mod;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
357 default:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
358 return (operator_ty)0;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
359 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
360 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
361
36718
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36712
diff changeset
362 /* Set the context ctx for expr_ty e, recursively traversing e.
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
363
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
364 Only sets context for expr kinds that "can appear in assignment context"
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
365 (according to ../Parser/Python.asdl). For other expr kinds, it sets
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
366 an appropriate syntax error and returns false.
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
367 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
368
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
369 static int
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
370 set_context(struct compiling *c, expr_ty e, expr_context_ty ctx, const node *n)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
371 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
372 asdl_seq *s = NULL;
36418
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
373 /* If a particular expression type can't be used for assign / delete,
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
374 set expr_name to its name and an error message will be generated.
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
375 */
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
376 const char* expr_name = NULL;
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
377
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
378 /* The ast defines augmented store and load contexts, but the
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
379 implementation here doesn't actually use them. The code may be
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
380 a little more complex than necessary as a result. It also means
39037
9f70f6ba7b69 Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39034
diff changeset
381 that expressions in an augmented assignment have a Store context.
36418
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
382 Consider restructuring so that augmented assignment uses
36695
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36686
diff changeset
383 set_context(), too.
36418
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
384 */
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
385 assert(ctx != AugStore && ctx != AugLoad);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
386
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
387 switch (e->kind) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
388 case Attribute_kind:
47523
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
389 if (ctx == Store && !forbidden_check(c, n,
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
390 PyBytes_AS_STRING(e->v.Attribute.attr)))
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
391 return 0;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
392 e->v.Attribute.ctx = ctx;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
393 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
394 case Subscript_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
395 e->v.Subscript.ctx = ctx;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
396 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
397 case Name_kind:
47523
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
398 if (ctx == Store && !forbidden_check(c, n,
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
399 PyBytes_AS_STRING(e->v.Name.id)))
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
400 return 0;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
401 e->v.Name.ctx = ctx;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
402 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
403 case List_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
404 e->v.List.ctx = ctx;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
405 s = e->v.List.elts;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
406 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
407 case Tuple_kind:
54742
3eb8510808c9 give a better error message when deleting ()
Benjamin Peterson <benjamin@python.org>
parents: 54741
diff changeset
408 if (asdl_seq_LEN(e->v.Tuple.elts)) {
3eb8510808c9 give a better error message when deleting ()
Benjamin Peterson <benjamin@python.org>
parents: 54741
diff changeset
409 e->v.Tuple.ctx = ctx;
3eb8510808c9 give a better error message when deleting ()
Benjamin Peterson <benjamin@python.org>
parents: 54741
diff changeset
410 s = e->v.Tuple.elts;
3eb8510808c9 give a better error message when deleting ()
Benjamin Peterson <benjamin@python.org>
parents: 54741
diff changeset
411 }
3eb8510808c9 give a better error message when deleting ()
Benjamin Peterson <benjamin@python.org>
parents: 54741
diff changeset
412 else {
3eb8510808c9 give a better error message when deleting ()
Benjamin Peterson <benjamin@python.org>
parents: 54741
diff changeset
413 expr_name = "()";
3eb8510808c9 give a better error message when deleting ()
Benjamin Peterson <benjamin@python.org>
parents: 54741
diff changeset
414 }
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
415 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
416 case Lambda_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
417 expr_name = "lambda";
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
418 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
419 case Call_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
420 expr_name = "function call";
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
421 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
422 case BoolOp_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
423 case BinOp_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
424 case UnaryOp_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
425 expr_name = "operator";
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
426 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
427 case GeneratorExp_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
428 expr_name = "generator expression";
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
429 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
430 case Yield_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
431 expr_name = "yield expression";
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
432 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
433 case ListComp_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
434 expr_name = "list comprehension";
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
435 break;
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
436 case SetComp_kind:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
437 expr_name = "set comprehension";
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
438 break;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
439 case DictComp_kind:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
440 expr_name = "dict comprehension";
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
441 break;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
442 case Dict_kind:
62469
cb1ab8e91581 prevent assignment to set literals
Benjamin Peterson <benjamin@python.org>
parents: 61272
diff changeset
443 case Set_kind:
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
444 case Num_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
445 case Str_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
446 expr_name = "literal";
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
447 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
448 case Compare_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
449 expr_name = "comparison";
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
450 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
451 case Repr_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
452 expr_name = "repr";
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
453 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
454 case IfExp_kind:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
455 expr_name = "conditional expression";
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
456 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
457 default:
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
458 PyErr_Format(PyExc_SystemError,
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
459 "unexpected expression in assignment %d (line %d)",
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
460 e->kind, e->lineno);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
461 return 0;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
462 }
36418
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
463 /* Check for error string set by switch */
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
464 if (expr_name) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
465 char buf[300];
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
466 PyOS_snprintf(buf, sizeof(buf),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
467 "can't %s %s",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
468 ctx == Store ? "assign to" : "delete",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
469 expr_name);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
470 return ast_error(n, buf);
36418
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
471 }
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
472
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
473 /* If the LHS is a list or tuple, we need to set the assignment
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
474 context for all the contained elements.
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
475 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
476 if (s) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
477 int i;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
478
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
479 for (i = 0; i < asdl_seq_LEN(s); i++) {
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
480 if (!set_context(c, (expr_ty)asdl_seq_GET(s, i), ctx, n))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
481 return 0;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
482 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
483 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
484 return 1;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
485 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
486
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
487 static operator_ty
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
488 ast_for_augassign(struct compiling *c, const node *n)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
489 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
490 REQ(n, augassign);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
491 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
492 switch (STR(n)[0]) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
493 case '+':
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
494 return Add;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
495 case '-':
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
496 return Sub;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
497 case '/':
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
498 if (STR(n)[1] == '/')
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
499 return FloorDiv;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
500 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
501 return Div;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
502 case '%':
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
503 return Mod;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
504 case '<':
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
505 return LShift;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
506 case '>':
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
507 return RShift;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
508 case '&':
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
509 return BitAnd;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
510 case '^':
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
511 return BitXor;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
512 case '|':
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
513 return BitOr;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
514 case '*':
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
515 if (STR(n)[1] == '*')
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
516 return Pow;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
517 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
518 return Mult;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
519 default:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
520 PyErr_Format(PyExc_SystemError, "invalid augassign: %s", STR(n));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
521 return (operator_ty)0;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
522 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
523 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
524
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
525 static cmpop_ty
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
526 ast_for_comp_op(struct compiling *c, const node *n)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
527 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
528 /* comp_op: '<'|'>'|'=='|'>='|'<='|'<>'|'!='|'in'|'not' 'in'|'is'
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
529 |'is' 'not'
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
530 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
531 REQ(n, comp_op);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
532 if (NCH(n) == 1) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
533 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
534 switch (TYPE(n)) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
535 case LESS:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
536 return Lt;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
537 case GREATER:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
538 return Gt;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
539 case EQEQUAL: /* == */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
540 return Eq;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
541 case LESSEQUAL:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
542 return LtE;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
543 case GREATEREQUAL:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
544 return GtE;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
545 case NOTEQUAL:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
546 return NotEq;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
547 case NAME:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
548 if (strcmp(STR(n), "in") == 0)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
549 return In;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
550 if (strcmp(STR(n), "is") == 0)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
551 return Is;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
552 default:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
553 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
554 STR(n));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
555 return (cmpop_ty)0;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
556 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
557 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
558 else if (NCH(n) == 2) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
559 /* handle "not in" and "is not" */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
560 switch (TYPE(CHILD(n, 0))) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
561 case NAME:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
562 if (strcmp(STR(CHILD(n, 1)), "in") == 0)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
563 return NotIn;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
564 if (strcmp(STR(CHILD(n, 0)), "is") == 0)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
565 return IsNot;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
566 default:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
567 PyErr_Format(PyExc_SystemError, "invalid comp_op: %s %s",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
568 STR(CHILD(n, 0)), STR(CHILD(n, 1)));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
569 return (cmpop_ty)0;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
570 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
571 }
35870
f531c05cd240 Convert all internal errors from Exception to SystemError
Neal Norwitz <nnorwitz@gmail.com>
parents: 35868
diff changeset
572 PyErr_Format(PyExc_SystemError, "invalid comp_op: has %d children",
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
573 NCH(n));
37604
c732f66c913f Convert 0 to their respective enum types. Convert
Martin v. Löwis <martin@v.loewis.de>
parents: 37597
diff changeset
574 return (cmpop_ty)0;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
575 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
576
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
577 static asdl_seq *
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
578 seq_for_testlist(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
579 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
580 /* testlist: test (',' test)* [','] */
35759
d91ed7107fd2 ANSI-C-ify the placement of local var declarations.
Armin Rigo <arigo@tunes.org>
parents: 35748
diff changeset
581 asdl_seq *seq;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations.
Armin Rigo <arigo@tunes.org>
parents: 35748
diff changeset
582 expr_ty expression;
d91ed7107fd2 ANSI-C-ify the placement of local var declarations.
Armin Rigo <arigo@tunes.org>
parents: 35748
diff changeset
583 int i;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
584 assert(TYPE(n) == testlist ||
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
585 TYPE(n) == listmaker ||
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
586 TYPE(n) == testlist_comp ||
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
587 TYPE(n) == testlist_safe ||
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
588 TYPE(n) == testlist1);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
589
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
590 seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
591 if (!seq)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
592 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
593
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
594 for (i = 0; i < NCH(n); i += 2) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
595 assert(TYPE(CHILD(n, i)) == test || TYPE(CHILD(n, i)) == old_test);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
596
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
597 expression = ast_for_expr(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
598 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
599 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
600
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
601 assert(i / 2 < seq->size);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
602 asdl_seq_SET(seq, i / 2, expression);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
603 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
604 return seq;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
605 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
606
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
607 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
608 compiler_complex_args(struct compiling *c, const node *n)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
609 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
610 int i, len = (NCH(n) + 1) / 2;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
611 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
612 asdl_seq *args = asdl_seq_new(len, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
613 if (!args)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
614 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
615
39872
b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)).
Neal Norwitz <nnorwitz@gmail.com>
parents: 39779
diff changeset
616 /* fpdef: NAME | '(' fplist ')'
b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)).
Neal Norwitz <nnorwitz@gmail.com>
parents: 39779
diff changeset
617 fplist: fpdef (',' fpdef)* [',']
b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)).
Neal Norwitz <nnorwitz@gmail.com>
parents: 39779
diff changeset
618 */
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
619 REQ(n, fplist);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
620 for (i = 0; i < len; i++) {
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
621 PyObject *arg_id;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
622 const node *fpdef_node = CHILD(n, 2*i);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
623 const node *child;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
624 expr_ty arg;
39872
b8cb7201379c Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)).
Neal Norwitz <nnorwitz@gmail.com>
parents: 39779
diff changeset
625 set_name:
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
626 /* fpdef_node is either a NAME or an fplist */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
627 child = CHILD(fpdef_node, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
628 if (TYPE(child) == NAME) {
47523
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
629 if (!forbidden_check(c, n, STR(child)))
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
630 return NULL;
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
631 arg_id = NEW_IDENTIFIER(child);
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
632 if (!arg_id)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
633 return NULL;
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
634 arg = Name(arg_id, Store, LINENO(child), child->n_col_offset,
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
635 c->c_arena);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
636 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
637 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
638 assert(TYPE(fpdef_node) == fpdef);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
639 /* fpdef_node[0] is not a name, so it must be '(', get CHILD[1] */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
640 child = CHILD(fpdef_node, 1);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
641 assert(TYPE(child) == fplist);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
642 /* NCH == 1 means we have (x), we need to elide the extra parens */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
643 if (NCH(child) == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
644 fpdef_node = CHILD(child, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
645 assert(TYPE(fpdef_node) == fpdef);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
646 goto set_name;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
647 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
648 arg = compiler_complex_args(c, child);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
649 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
650 asdl_seq_SET(args, i, arg);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
651 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
652
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
653 result = Tuple(args, Store, LINENO(n), n->n_col_offset, c->c_arena);
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
654 if (!set_context(c, result, Store, n))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
655 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
656 return result;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
657 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
658
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
659
36718
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36712
diff changeset
660 /* Create AST for argument list. */
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
661
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
662 static arguments_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
663 ast_for_arguments(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
664 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
665 /* parameters: '(' [varargslist] ')'
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
666 varargslist: (fpdef ['=' test] ',')* ('*' NAME [',' '**' NAME]
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
667 | '**' NAME) | fpdef ['=' test] (',' fpdef ['=' test])* [',']
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
668 */
36718
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36712
diff changeset
669 int i, j, k, n_args = 0, n_defaults = 0, found_default = 0;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
670 asdl_seq *args, *defaults;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
671 identifier vararg = NULL, kwarg = NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
672 node *ch;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
673
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
674 if (TYPE(n) == parameters) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
675 if (NCH(n) == 2) /* () as argument list */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
676 return arguments(NULL, NULL, NULL, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
677 n = CHILD(n, 1);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
678 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
679 REQ(n, varargslist);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
680
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
681 /* first count the number of normal args & defaults */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
682 for (i = 0; i < NCH(n); i++) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
683 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
684 if (TYPE(ch) == fpdef)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
685 n_args++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
686 if (TYPE(ch) == EQUAL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
687 n_defaults++;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
688 }
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
689 args = (n_args ? asdl_seq_new(n_args, c->c_arena) : NULL);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
690 if (!args && n_args)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
691 return NULL; /* Don't need to goto error; no objects allocated */
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
692 defaults = (n_defaults ? asdl_seq_new(n_defaults, c->c_arena) : NULL);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
693 if (!defaults && n_defaults)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
694 return NULL; /* Don't need to goto error; no objects allocated */
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
695
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
696 /* fpdef: NAME | '(' fplist ')'
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
697 fplist: fpdef (',' fpdef)* [',']
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
698 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
699 i = 0;
36718
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36712
diff changeset
700 j = 0; /* index for defaults */
45e6f901902c Remove asdl_seq_APPEND() and simplify asdl seq implementation.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36712
diff changeset
701 k = 0; /* index for args */
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
702 while (i < NCH(n)) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
703 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
704 switch (TYPE(ch)) {
57367
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
705 case fpdef: {
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
706 int complex_args = 0, parenthesized = 0;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
707 handle_fpdef:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
708 /* XXX Need to worry about checking if TYPE(CHILD(n, i+1)) is
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
709 anything other than EQUAL or a comma? */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
710 /* XXX Should NCH(n) check be made a separate check? */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
711 if (i + 1 < NCH(n) && TYPE(CHILD(n, i + 1)) == EQUAL) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
712 expr_ty expression = ast_for_expr(c, CHILD(n, i + 2));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
713 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
714 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
715 assert(defaults != NULL);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
716 asdl_seq_SET(defaults, j++, expression);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
717 i += 2;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
718 found_default = 1;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
719 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
720 else if (found_default) {
57367
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
721 /* def f((x)=4): pass should raise an error.
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
722 def f((x, (y))): pass will just incur the tuple unpacking warning. */
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
723 if (parenthesized && !complex_args) {
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
724 ast_error(n, "parenthesized arg with default");
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
725 goto error;
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
726 }
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
727 ast_error(n,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
728 "non-default argument follows default argument");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
729 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
730 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
731 if (NCH(ch) == 3) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
732 ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
733 /* def foo((x)): is not complex, special case. */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
734 if (NCH(ch) != 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
735 /* We have complex arguments, setup for unpacking. */
47524
53253f36014e warn about parameter tuple unpacking
Benjamin Peterson <benjamin@python.org>
parents: 47523
diff changeset
736 if (Py_Py3kWarningFlag && !ast_warn(c, ch,
53253f36014e warn about parameter tuple unpacking
Benjamin Peterson <benjamin@python.org>
parents: 47523
diff changeset
737 "tuple parameter unpacking has been removed in 3.x"))
53253f36014e warn about parameter tuple unpacking
Benjamin Peterson <benjamin@python.org>
parents: 47523
diff changeset
738 goto error;
57367
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
739 complex_args = 1;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
740 asdl_seq_SET(args, k++, compiler_complex_args(c, ch));
41579
7a4f174df844 Handle a couple of uncaught errors. This should be backported
Neal Norwitz <nnorwitz@gmail.com>
parents: 41578
diff changeset
741 if (!asdl_seq_GET(args, k-1))
7a4f174df844 Handle a couple of uncaught errors. This should be backported
Neal Norwitz <nnorwitz@gmail.com>
parents: 41578
diff changeset
742 goto error;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
743 } else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
744 /* def foo((x)): setup for checking NAME below. */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
745 /* Loop because there can be many parens and tuple
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
746 unpacking mixed in. */
57367
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
747 parenthesized = 1;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
748 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
749 assert(TYPE(ch) == fpdef);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
750 goto handle_fpdef;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
751 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
752 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
753 if (TYPE(CHILD(ch, 0)) == NAME) {
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
754 PyObject *id;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
755 expr_ty name;
47523
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
756 if (!forbidden_check(c, n, STR(CHILD(ch, 0))))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
757 goto error;
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
758 id = NEW_IDENTIFIER(CHILD(ch, 0));
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
759 if (!id)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
760 goto error;
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
761 name = Name(id, Param, LINENO(ch), ch->n_col_offset,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
762 c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
763 if (!name)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
764 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
765 asdl_seq_SET(args, k++, name);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
766
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
767 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
768 i += 2; /* the name and the comma */
57367
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
769 if (parenthesized && Py_Py3kWarningFlag &&
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
770 !ast_warn(c, ch, "parenthesized argument names "
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
771 "are invalid in 3.x"))
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
772 goto error;
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
773
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
774 break;
57367
ed30bcffa146 improve several corner cases related with argument names in parenthesis
Benjamin Peterson <benjamin@python.org>
parents: 56956
diff changeset
775 }
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
776 case STAR:
47523
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
777 if (!forbidden_check(c, CHILD(n, i+1), STR(CHILD(n, i+1))))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
778 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
779 vararg = NEW_IDENTIFIER(CHILD(n, i+1));
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
780 if (!vararg)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
781 goto error;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
782 i += 3;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
783 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
784 case DOUBLESTAR:
47523
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
785 if (!forbidden_check(c, CHILD(n, i+1), STR(CHILD(n, i+1))))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
786 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
787 kwarg = NEW_IDENTIFIER(CHILD(n, i+1));
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
788 if (!kwarg)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
789 goto error;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
790 i += 3;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
791 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
792 default:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
793 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
794 "unexpected node in varargslist: %d @ %d",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
795 TYPE(ch), i);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
796 goto error;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
797 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
798 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
799
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
800 return arguments(args, vararg, kwarg, defaults, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
801
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
802 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
803 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
804 Py_XDECREF(kwarg);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
805 return NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
806 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
807
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
808 static expr_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
809 ast_for_dotted_name(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
810 {
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
811 expr_ty e;
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
812 identifier id;
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
813 int lineno, col_offset;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
814 int i;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
815
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
816 REQ(n, dotted_name);
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
817
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
818 lineno = LINENO(n);
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
819 col_offset = n->n_col_offset;
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
820
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
821 id = NEW_IDENTIFIER(CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
822 if (!id)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
823 return NULL;
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
824 e = Name(id, Load, lineno, col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
825 if (!e)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
826 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
827
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
828 for (i = 2; i < NCH(n); i+=2) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
829 id = NEW_IDENTIFIER(CHILD(n, i));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
830 if (!id)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
831 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
832 e = Attribute(e, id, Load, lineno, col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
833 if (!e)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
834 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
835 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
836
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
837 return e;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
838 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
839
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
840 static expr_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
841 ast_for_decorator(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
842 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
843 /* decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
844 expr_ty d = NULL;
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
845 expr_ty name_expr;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
846
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
847 REQ(n, decorator);
36418
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
848 REQ(CHILD(n, 0), AT);
a625e8876407 Improved handling of syntax errors.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36242
diff changeset
849 REQ(RCHILD(n, -1), NEWLINE);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
850
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
851 name_expr = ast_for_dotted_name(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
852 if (!name_expr)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
853 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
854
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
855 if (NCH(n) == 3) { /* No arguments */
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
856 d = name_expr;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
857 name_expr = NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
858 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
859 else if (NCH(n) == 5) { /* Call with no arguments */
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
860 d = Call(name_expr, NULL, NULL, NULL, NULL, LINENO(n),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
861 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
862 if (!d)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
863 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
864 name_expr = NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
865 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
866 else {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
867 d = ast_for_call(c, CHILD(n, 3), name_expr);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
868 if (!d)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
869 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
870 name_expr = NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
871 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
872
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
873 return d;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
874 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
875
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
876 static asdl_seq*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
877 ast_for_decorators(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
878 {
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
879 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
880 expr_ty d;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
881 int i;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
882
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
883 REQ(n, decorators);
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
884 decorator_seq = asdl_seq_new(NCH(n), c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
885 if (!decorator_seq)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
886 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
887
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
888 for (i = 0; i < NCH(n); i++) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
889 d = ast_for_decorator(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
890 if (!d)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
891 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
892 asdl_seq_SET(decorator_seq, i, d);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
893 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
894 return decorator_seq;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
895 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
896
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
897 static stmt_ty
45447
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
898 ast_for_funcdef(struct compiling *c, const node *n, asdl_seq *decorator_seq)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
899 {
45447
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
900 /* funcdef: 'def' NAME parameters ':' suite */
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
901 identifier name;
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
902 arguments_ty args;
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
903 asdl_seq *body;
45447
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
904 int name_i = 1;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
905
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
906 REQ(n, funcdef);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
907
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
908 name = NEW_IDENTIFIER(CHILD(n, name_i));
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
909 if (!name)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
910 return NULL;
47523
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
911 else if (!forbidden_check(c, CHILD(n, name_i), STR(CHILD(n, name_i))))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
912 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
913 args = ast_for_arguments(c, CHILD(n, name_i + 1));
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
914 if (!args)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
915 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
916 body = ast_for_suite(c, CHILD(n, name_i + 3));
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
917 if (!body)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
918 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
919
37453
16a64e394602 Add lineno, col_offset to excephandler to enable future fix for
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 37235
diff changeset
920 return FunctionDef(name, args, body, decorator_seq, LINENO(n),
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
921 n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
922 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
923
45447
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
924 static stmt_ty
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
925 ast_for_decorated(struct compiling *c, const node *n)
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
926 {
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
927 /* decorated: decorators (classdef | funcdef) */
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
928 stmt_ty thing = NULL;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
929 asdl_seq *decorator_seq = NULL;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
930
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
931 REQ(n, decorated);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
932
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
933 decorator_seq = ast_for_decorators(c, CHILD(n, 0));
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
934 if (!decorator_seq)
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
935 return NULL;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
936
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
937 assert(TYPE(CHILD(n, 1)) == funcdef ||
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
938 TYPE(CHILD(n, 1)) == classdef);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
939
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
940 if (TYPE(CHILD(n, 1)) == funcdef) {
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
941 thing = ast_for_funcdef(c, CHILD(n, 1), decorator_seq);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
942 } else if (TYPE(CHILD(n, 1)) == classdef) {
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
943 thing = ast_for_classdef(c, CHILD(n, 1), decorator_seq);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
944 }
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
945 /* we count the decorators in when talking about the class' or
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
946 function's line number */
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
947 if (thing) {
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
948 thing->lineno = LINENO(n);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
949 thing->col_offset = n->n_col_offset;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
950 }
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
951 return thing;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
952 }
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
953
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
954 static expr_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
955 ast_for_lambdef(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
956 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
957 /* lambdef: 'lambda' [varargslist] ':' test */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
958 arguments_ty args;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
959 expr_ty expression;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
960
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
961 if (NCH(n) == 3) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
962 args = arguments(NULL, NULL, NULL, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
963 if (!args)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
964 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
965 expression = ast_for_expr(c, CHILD(n, 2));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
966 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
967 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
968 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
969 else {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
970 args = ast_for_arguments(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
971 if (!args)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
972 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
973 expression = ast_for_expr(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
974 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
975 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
976 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
977
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
978 return Lambda(args, expression, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
979 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
980
36666
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It
Thomas Wouters <thomas@python.org>
parents: 36444
diff changeset
981 static expr_ty
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It
Thomas Wouters <thomas@python.org>
parents: 36444
diff changeset
982 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
983 {
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
984 /* test: or_test 'if' or_test 'else' test */
36666
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It
Thomas Wouters <thomas@python.org>
parents: 36444
diff changeset
985 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
986
36676
67c74efad8c2 Fix old not-reading-pep-308-right artifact.
Thomas Wouters <thomas@python.org>
parents: 36670
diff changeset
987 assert(NCH(n) == 5);
36666
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It
Thomas Wouters <thomas@python.org>
parents: 36444
diff changeset
988 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
989 if (!body)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
990 return NULL;
36666
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It
Thomas Wouters <thomas@python.org>
parents: 36444
diff changeset
991 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
992 if (!expression)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
993 return NULL;
36666
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It
Thomas Wouters <thomas@python.org>
parents: 36444
diff changeset
994 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
995 if (!orelse)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
996 return NULL;
37453
16a64e394602 Add lineno, col_offset to excephandler to enable future fix for
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 37235
diff changeset
997 return IfExp(expression, body, orelse, LINENO(n), n->n_col_offset,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
998 c->c_arena);
36666
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It
Thomas Wouters <thomas@python.org>
parents: 36444
diff changeset
999 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It
Thomas Wouters <thomas@python.org>
parents: 36444
diff changeset
1000
39755
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces.
Neal Norwitz <nnorwitz@gmail.com>
parents: 39753
diff changeset
1001 /* XXX(nnorwitz): the listcomp and genexpr code should be refactored
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces.
Neal Norwitz <nnorwitz@gmail.com>
parents: 39753
diff changeset
1002 so there is only a single version. Possibly for loops can also re-use
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces.
Neal Norwitz <nnorwitz@gmail.com>
parents: 39753
diff changeset
1003 the code.
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces.
Neal Norwitz <nnorwitz@gmail.com>
parents: 39753
diff changeset
1004 */
c591d9954fb3 Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces.
Neal Norwitz <nnorwitz@gmail.com>
parents: 39753
diff changeset
1005
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1006 /* Count the number of 'for' loop in a list comprehension.
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1007
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1008 Helper for ast_for_listcomp().
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1009 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1010
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1011 static int
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
1012 count_list_fors(struct compiling *c, const node *n)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1013 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1014 int n_fors = 0;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1015 node *ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1016
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1017 count_list_for:
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1018 n_fors++;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1019 REQ(ch, list_for);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1020 if (NCH(ch) == 5)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1021 ch = CHILD(ch, 4);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1022 else
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1023 return n_fors;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1024 count_list_iter:
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1025 REQ(ch, list_iter);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1026 ch = CHILD(ch, 0);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1027 if (TYPE(ch) == list_for)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1028 goto count_list_for;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1029 else if (TYPE(ch) == list_if) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1030 if (NCH(ch) == 3) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1031 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1032 goto count_list_iter;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1033 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1034 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1035 return n_fors;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1036 }
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
1037
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
1038 /* Should never be reached */
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
1039 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
1040 return -1;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1041 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1042
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1043 /* Count the number of 'if' statements in a list comprehension.
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1044
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1045 Helper for ast_for_listcomp().
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1046 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1047
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1048 static int
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
1049 count_list_ifs(struct compiling *c, const node *n)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1050 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1051 int n_ifs = 0;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1052
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1053 count_list_iter:
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1054 REQ(n, list_iter);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1055 if (TYPE(CHILD(n, 0)) == list_for)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1056 return n_ifs;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1057 n = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1058 REQ(n, list_if);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1059 n_ifs++;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1060 if (NCH(n) == 2)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1061 return n_ifs;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1062 n = CHILD(n, 2);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1063 goto count_list_iter;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1064 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1065
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1066 static expr_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1067 ast_for_listcomp(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1068 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1069 /* listmaker: test ( list_for | (',' test)* [','] )
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1070 list_for: 'for' exprlist 'in' testlist_safe [list_iter]
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1071 list_iter: list_for | list_if
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1072 list_if: 'if' test [list_iter]
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1073 testlist_safe: test [(',' test)+ [',']]
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1074 */
55651
1e2877026435 better col_offsets for "for" statements with tuple unpacking #6704
Benjamin Peterson <benjamin@python.org>
parents: 55362
diff changeset
1075 expr_ty elt, first;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1076 asdl_seq *listcomps;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1077 int i, n_fors;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1078 node *ch;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1079
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1080 REQ(n, listmaker);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1081 assert(NCH(n) > 1);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1082
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1083 elt = ast_for_expr(c, CHILD(n, 0));
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1084 if (!elt)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1085 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1086
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
1087 n_fors = count_list_fors(c, n);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1088 if (n_fors == -1)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1089 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1090
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
1091 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
1092 if (!listcomps)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1093 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
1094
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1095 ch = CHILD(n, 1);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1096 for (i = 0; i < n_fors; i++) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1097 comprehension_ty lc;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1098 asdl_seq *t;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1099 expr_ty expression;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1100 node *for_ch;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1101
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1102 REQ(ch, list_for);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1103
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1104 for_ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1105 t = ast_for_exprlist(c, for_ch, Store);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1106 if (!t)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1107 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1108 expression = ast_for_testlist(c, CHILD(ch, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1109 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1110 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1111
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1112 /* Check the # of children rather than the length of t, since
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1113 [x for x, in ... ] has 1 element in t, but still requires a Tuple.
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1114 */
55651
1e2877026435 better col_offsets for "for" statements with tuple unpacking #6704
Benjamin Peterson <benjamin@python.org>
parents: 55362
diff changeset
1115 first = (expr_ty)asdl_seq_GET(t, 0);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1116 if (NCH(for_ch) == 1)
55651
1e2877026435 better col_offsets for "for" statements with tuple unpacking #6704
Benjamin Peterson <benjamin@python.org>
parents: 55362
diff changeset
1117 lc = comprehension(first, expression, NULL, c->c_arena);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1118 else
55651
1e2877026435 better col_offsets for "for" statements with tuple unpacking #6704
Benjamin Peterson <benjamin@python.org>
parents: 55362
diff changeset
1119 lc = comprehension(Tuple(t, Store, first->lineno, first->col_offset,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1120 c->c_arena),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1121 expression, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1122 if (!lc)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1123 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1124
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1125 if (NCH(ch) == 5) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1126 int j, n_ifs;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1127 asdl_seq *ifs;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1128 expr_ty list_for_expr;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1129
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1130 ch = CHILD(ch, 4);
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
1131 n_ifs = count_list_ifs(c, ch);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1132 if (n_ifs == -1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1133 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1134
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1135 ifs = asdl_seq_new(n_ifs, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1136 if (!ifs)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1137 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1138
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1139 for (j = 0; j < n_ifs; j++) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1140 REQ(ch, list_iter);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1141 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1142 REQ(ch, list_if);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1143
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1144 list_for_expr = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1145 if (!list_for_expr)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1146 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1147
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1148 asdl_seq_SET(ifs, j, list_for_expr);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1149 if (NCH(ch) == 3)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1150 ch = CHILD(ch, 2);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1151 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1152 /* on exit, must guarantee that ch is a list_for */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1153 if (TYPE(ch) == list_iter)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1154 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1155 lc->ifs = ifs;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1156 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1157 asdl_seq_SET(listcomps, i, lc);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1158 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1159
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
1160 return ListComp(elt, listcomps, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1161 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1162
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1163 /*
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1164 Count the number of 'for' loops in a comprehension.
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1165
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1166 Helper for ast_for_comprehension().
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1167 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1168
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1169 static int
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1170 count_comp_fors(struct compiling *c, const node *n)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1171 {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1172 int n_fors = 0;
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1173
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1174 count_comp_for:
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1175 n_fors++;
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1176 REQ(n, comp_for);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1177 if (NCH(n) == 5)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1178 n = CHILD(n, 4);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1179 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1180 return n_fors;
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1181 count_comp_iter:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1182 REQ(n, comp_iter);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1183 n = CHILD(n, 0);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1184 if (TYPE(n) == comp_for)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1185 goto count_comp_for;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1186 else if (TYPE(n) == comp_if) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1187 if (NCH(n) == 3) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1188 n = CHILD(n, 2);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1189 goto count_comp_iter;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1190 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1191 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1192 return n_fors;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1193 }
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1194
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1195 /* Should never be reached */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1196 PyErr_SetString(PyExc_SystemError,
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1197 "logic error in count_comp_fors");
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1198 return -1;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1199 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1200
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1201 /* Count the number of 'if' statements in a comprehension.
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1202
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1203 Helper for ast_for_comprehension().
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1204 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1205
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1206 static int
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1207 count_comp_ifs(struct compiling *c, const node *n)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1208 {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1209 int n_ifs = 0;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1210
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1211 while (1) {
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1212 REQ(n, comp_iter);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1213 if (TYPE(CHILD(n, 0)) == comp_for)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1214 return n_ifs;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1215 n = CHILD(n, 0);
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1216 REQ(n, comp_if);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1217 n_ifs++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1218 if (NCH(n) == 2)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1219 return n_ifs;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1220 n = CHILD(n, 2);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1221 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1222 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1223
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1224 static asdl_seq *
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1225 ast_for_comprehension(struct compiling *c, const node *n)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1226 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1227 int i, n_fors;
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1228 asdl_seq *comps;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1229
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1230 n_fors = count_comp_fors(c, n);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1231 if (n_fors == -1)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1232 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
1233
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1234 comps = asdl_seq_new(n_fors, c->c_arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1235 if (!comps)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1236 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
1237
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1238 for (i = 0; i < n_fors; i++) {
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1239 comprehension_ty comp;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1240 asdl_seq *t;
55651
1e2877026435 better col_offsets for "for" statements with tuple unpacking #6704
Benjamin Peterson <benjamin@python.org>
parents: 55362
diff changeset
1241 expr_ty expression, first;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1242 node *for_ch;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1243
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1244 REQ(n, comp_for);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1245
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1246 for_ch = CHILD(n, 1);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1247 t = ast_for_exprlist(c, for_ch, Store);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1248 if (!t)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1249 return NULL;
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1250 expression = ast_for_expr(c, CHILD(n, 3));
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1251 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1252 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
1253
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1254 /* Check the # of children rather than the length of t, since
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1255 (x for x, in ...) has 1 element in t, but still requires a Tuple. */
55651
1e2877026435 better col_offsets for "for" statements with tuple unpacking #6704
Benjamin Peterson <benjamin@python.org>
parents: 55362
diff changeset
1256 first = (expr_ty)asdl_seq_GET(t, 0);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1257 if (NCH(for_ch) == 1)
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1258 comp = comprehension(first, expression, NULL, c->c_arena);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1259 else
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1260 comp = comprehension(Tuple(t, Store, first->lineno, first->col_offset,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1261 c->c_arena),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1262 expression, NULL, c->c_arena);
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1263 if (!comp)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1264 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
1265
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1266 if (NCH(n) == 5) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1267 int j, n_ifs;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1268 asdl_seq *ifs;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1269
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1270 n = CHILD(n, 4);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1271 n_ifs = count_comp_ifs(c, n);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1272 if (n_ifs == -1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1273 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
1274
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1275 ifs = asdl_seq_new(n_ifs, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1276 if (!ifs)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1277 return NULL;
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
1278
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1279 for (j = 0; j < n_ifs; j++) {
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1280 REQ(n, comp_iter);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1281 n = CHILD(n, 0);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1282 REQ(n, comp_if);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1283
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1284 expression = ast_for_expr(c, CHILD(n, 1));
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1285 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1286 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1287 asdl_seq_SET(ifs, j, expression);
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1288 if (NCH(n) == 3)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1289 n = CHILD(n, 2);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1290 }
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1291 /* on exit, must guarantee that n is a comp_for */
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1292 if (TYPE(n) == comp_iter)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1293 n = CHILD(n, 0);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1294 comp->ifs = ifs;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1295 }
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1296 asdl_seq_SET(comps, i, comp);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1297 }
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1298 return comps;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1299 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1300
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1301 static expr_ty
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1302 ast_for_itercomp(struct compiling *c, const node *n, int type)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1303 {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1304 expr_ty elt;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1305 asdl_seq *comps;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1306
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1307 assert(NCH(n) > 1);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1308
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1309 elt = ast_for_expr(c, CHILD(n, 0));
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1310 if (!elt)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1311 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1312
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1313 comps = ast_for_comprehension(c, CHILD(n, 1));
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1314 if (!comps)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1315 return NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1316
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1317 if (type == COMP_GENEXP)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1318 return GeneratorExp(elt, comps, LINENO(n), n->n_col_offset, c->c_arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1319 else if (type == COMP_SETCOMP)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1320 return SetComp(elt, comps, LINENO(n), n->n_col_offset, c->c_arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1321 else
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1322 /* Should never happen */
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1323 return NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1324 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1325
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1326 static expr_ty
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1327 ast_for_dictcomp(struct compiling *c, const node *n)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1328 {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1329 expr_ty key, value;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1330 asdl_seq *comps;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1331
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1332 assert(NCH(n) > 3);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1333 REQ(CHILD(n, 1), COLON);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1334
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1335 key = ast_for_expr(c, CHILD(n, 0));
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1336 if (!key)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1337 return NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1338
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1339 value = ast_for_expr(c, CHILD(n, 2));
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1340 if (!value)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1341 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1342
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1343 comps = ast_for_comprehension(c, CHILD(n, 3));
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1344 if (!comps)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1345 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1346
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1347 return DictComp(key, value, comps, LINENO(n), n->n_col_offset, c->c_arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1348 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1349
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1350 static expr_ty
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1351 ast_for_genexp(struct compiling *c, const node *n)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1352 {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1353 assert(TYPE(n) == (testlist_comp) || TYPE(n) == (argument));
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1354 return ast_for_itercomp(c, n, COMP_GENEXP);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1355 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1356
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1357 static expr_ty
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1358 ast_for_setcomp(struct compiling *c, const node *n)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1359 {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1360 assert(TYPE(n) == (dictorsetmaker));
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1361 return ast_for_itercomp(c, n, COMP_SETCOMP);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1362 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1363
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1364 static expr_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1365 ast_for_atom(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1366 {
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1367 /* atom: '(' [yield_expr|testlist_comp] ')' | '[' [listmaker] ']'
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1368 | '{' [dictmaker] '}' | '`' testlist '`' | NAME | NUMBER | STRING+
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1369 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1370 node *ch = CHILD(n, 0);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1371
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1372 switch (TYPE(ch)) {
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
1373 case NAME: {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1374 /* All names start in Load context, but may later be
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1375 changed. */
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
1376 PyObject *name = NEW_IDENTIFIER(ch);
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
1377 if (!name)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
1378 return NULL;
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
1379 return Name(name, Load, LINENO(n), n->n_col_offset, c->c_arena);
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
1380 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1381 case STRING: {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1382 PyObject *str = parsestrplus(c, n);
42308
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1383 if (!str) {
44572
db5e01c33eb7 Make Python compile with --disable-unicode.
Georg Brandl <georg@python.org>
parents: 43997
diff changeset
1384 #ifdef Py_USING_UNICODE
42308
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1385 if (PyErr_ExceptionMatches(PyExc_UnicodeError)){
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1386 PyObject *type, *value, *tback, *errstr;
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1387 PyErr_Fetch(&type, &value, &tback);
49795
b64d053afd84 don't segfault when \N escapes are used and unicodedata fails to load
Benjamin Peterson <benjamin@python.org>
parents: 49696
diff changeset
1388 errstr = PyObject_Str(value);
42308
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1389 if (errstr) {
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1390 char *s = "";
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1391 char buf[128];
47527
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
1392 s = PyString_AsString(errstr);
42308
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1393 PyOS_snprintf(buf, sizeof(buf), "(unicode error) %s", s);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1394 ast_error(n, buf);
49795
b64d053afd84 don't segfault when \N escapes are used and unicodedata fails to load
Benjamin Peterson <benjamin@python.org>
parents: 49696
diff changeset
1395 Py_DECREF(errstr);
42308
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1396 } else {
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1397 ast_error(n, "(unicode error) unknown error");
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1398 }
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1399 Py_DECREF(type);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1400 Py_DECREF(value);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1401 Py_XDECREF(tback);
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1402 }
44572
db5e01c33eb7 Make Python compile with --disable-unicode.
Georg Brandl <georg@python.org>
parents: 43997
diff changeset
1403 #endif
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1404 return NULL;
42308
6775ee6d89d3 SF patch# 1755885 by Kurt Kaiser: show location of Unicode escape errors.
Guido van Rossum <guido@python.org>
parents: 41974
diff changeset
1405 }
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1406 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1407 return Str(str, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1408 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1409 case NUMBER: {
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
1410 PyObject *pynum = parsenumber(c, STR(ch));
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1411 if (!pynum)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1412 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
1413
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1414 PyArena_AddPyObject(c->c_arena, pynum);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1415 return Num(pynum, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1416 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1417 case LPAR: /* some parenthesized expressions */
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1418 ch = CHILD(n, 1);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1419
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1420 if (TYPE(ch) == RPAR)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1421 return Tuple(NULL, Load, LINENO(n), n->n_col_offset, c->c_arena);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1422
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1423 if (TYPE(ch) == yield_expr)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1424 return ast_for_expr(c, ch);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1425
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1426 return ast_for_testlist_comp(c, ch);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1427 case LSQB: /* list (or list comprehension) */
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1428 ch = CHILD(n, 1);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1429
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1430 if (TYPE(ch) == RSQB)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1431 return List(NULL, Load, LINENO(n), n->n_col_offset, c->c_arena);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1432
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1433 REQ(ch, listmaker);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1434 if (NCH(ch) == 1 || TYPE(CHILD(ch, 1)) == COMMA) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1435 asdl_seq *elts = seq_for_testlist(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1436 if (!elts)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1437 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
1438
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1439 return List(elts, Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1440 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1441 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1442 return ast_for_listcomp(c, ch);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1443 case LBRACE: {
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1444 /* dictorsetmaker:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1445 * (test ':' test (comp_for | (',' test ':' test)* [','])) |
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1446 * (test (comp_for | (',' test)* [',']))
58229
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1447 */
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1448 int i, size;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1449 asdl_seq *keys, *values;
58229
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1450
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1451 ch = CHILD(n, 1);
58229
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1452 if (TYPE(ch) == RBRACE) {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1453 /* it's an empty dict */
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1454 return Dict(NULL, NULL, LINENO(n), n->n_col_offset, c->c_arena);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1455 } else if (NCH(ch) == 1 || TYPE(CHILD(ch, 1)) == COMMA) {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1456 /* it's a simple set */
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1457 asdl_seq *elts;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1458 size = (NCH(ch) + 1) / 2; /* +1 in case no trailing comma */
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1459 elts = asdl_seq_new(size, c->c_arena);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1460 if (!elts)
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1461 return NULL;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1462 for (i = 0; i < NCH(ch); i += 2) {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1463 expr_ty expression;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1464 expression = ast_for_expr(c, CHILD(ch, i));
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1465 if (!expression)
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1466 return NULL;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1467 asdl_seq_SET(elts, i / 2, expression);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1468 }
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1469 return Set(elts, LINENO(n), n->n_col_offset, c->c_arena);
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1470 } else if (TYPE(CHILD(ch, 1)) == comp_for) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1471 /* it's a set comprehension */
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1472 return ast_for_setcomp(c, ch);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1473 } else if (NCH(ch) > 3 && TYPE(CHILD(ch, 3)) == comp_for) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1474 return ast_for_dictcomp(c, ch);
58229
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1475 } else {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1476 /* it's a dict */
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1477 size = (NCH(ch) + 1) / 4; /* +1 in case no trailing comma */
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1478 keys = asdl_seq_new(size, c->c_arena);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1479 if (!keys)
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1480 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1481
58229
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1482 values = asdl_seq_new(size, c->c_arena);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1483 if (!values)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1484 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1485
58229
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1486 for (i = 0; i < NCH(ch); i += 4) {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1487 expr_ty expression;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1488
58229
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1489 expression = ast_for_expr(c, CHILD(ch, i));
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1490 if (!expression)
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1491 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
1492
58229
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1493 asdl_seq_SET(keys, i / 4, expression);
35873
76ed7fdc9d85 Fix a whole bunch of potential memory leaks (and some real ones too)
Neal Norwitz <nnorwitz@gmail.com>
parents: 35870
diff changeset
1494
58229
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1495 expression = ast_for_expr(c, CHILD(ch, i + 2));
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1496 if (!expression)
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1497 return NULL;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1498
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1499 asdl_seq_SET(values, i / 4, expression);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1500 }
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 57367
diff changeset
1501 return Dict(keys, values, LINENO(n), n->n_col_offset, c->c_arena);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1502 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1503 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1504 case BACKQUOTE: { /* repr */
43985
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block.
Christian Heimes <christian@cheimes.de>
parents: 43984
diff changeset
1505 expr_ty expression;
47521
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
1506 if (Py_Py3kWarningFlag &&
31aee67019a2 add an ast_warn helper function to make adding those Py3k warnings easier
Benjamin Peterson <benjamin@python.org>
parents: 47516
diff changeset
1507 !ast_warn(c, n, "backquote not supported in 3.x; use repr()"))
43985
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block.
Christian Heimes <christian@cheimes.de>
parents: 43984
diff changeset
1508 return NULL;
2230f16e402b And yet another fix for the patch. Paul Moore has send me a note that I've missed a declaration. The additional code has moved the declaration in the middle of the block.
Christian Heimes <christian@cheimes.de>
parents: 43984
diff changeset
1509 expression = ast_for_testlist(c, CHILD(n, 1));
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1510 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1511 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
1512
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1513 return Repr(expression, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1514 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1515 default:
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1516 PyErr_Format(PyExc_SystemError, "unhandled atom %d", TYPE(ch));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1517 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1518 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1519 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1520
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1521 static slice_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1522 ast_for_slice(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1523 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1524 node *ch;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1525 expr_ty lower = NULL, upper = NULL, step = NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1526
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1527 REQ(n, subscript);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1528
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1529 /*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1530 subscript: '.' '.' '.' | test | [test] ':' [test] [sliceop]
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1531 sliceop: ':' [test]
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1532 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1533 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1534 if (TYPE(ch) == DOT)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1535 return Ellipsis(c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1536
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1537 if (NCH(n) == 1 && TYPE(ch) == test) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1538 /* 'step' variable hold no significance in terms of being used over
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1539 other vars */
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1540 step = ast_for_expr(c, ch);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1541 if (!step)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1542 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1543
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1544 return Index(step, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1545 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1546
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1547 if (TYPE(ch) == test) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1548 lower = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1549 if (!lower)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1550 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1551 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1552
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1553 /* If there's an upper bound it's in the second or third position. */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1554 if (TYPE(ch) == COLON) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1555 if (NCH(n) > 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1556 node *n2 = CHILD(n, 1);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1557
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1558 if (TYPE(n2) == test) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1559 upper = ast_for_expr(c, n2);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1560 if (!upper)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1561 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1562 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1563 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1564 } else if (NCH(n) > 2) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1565 node *n2 = CHILD(n, 2);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1566
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1567 if (TYPE(n2) == test) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1568 upper = ast_for_expr(c, n2);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1569 if (!upper)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1570 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1571 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1572 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1573
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1574 ch = CHILD(n, NCH(n) - 1);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1575 if (TYPE(ch) == sliceop) {
55362
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1576 if (NCH(ch) == 1) {
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1577 /*
55362
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1578 This is an extended slice (ie "x[::]") with no expression in the
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1579 step field. We set this literally to "None" in order to
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1580 disambiguate it from x[:]. (The interpreter might have to call
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1581 __getslice__ for x[:], but it must call __getitem__ for x[::].)
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1582 */
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1583 identifier none = new_identifier("None", c->c_arena);
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1584 if (!none)
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1585 return NULL;
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1586 ch = CHILD(ch, 0);
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1587 step = Name(none, Load, LINENO(ch), ch->n_col_offset, c->c_arena);
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1588 if (!step)
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1589 return NULL;
7bf8fc20037a the Slice in x[::] has to have step as None to help the interpreter
Benjamin Peterson <benjamin@python.org>
parents: 54743
diff changeset
1590 } else {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1591 ch = CHILD(ch, 1);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1592 if (TYPE(ch) == test) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1593 step = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1594 if (!step)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1595 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1596 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1597 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1598 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1599
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
1600 return Slice(lower, upper, step, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1601 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1602
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1603 static expr_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1604 ast_for_binop(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1605 {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1606 /* Must account for a sequence of expressions.
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1607 How should A op B op C by represented?
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1608 BinOp(BinOp(A, op, B), op, C).
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1609 */
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1610
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1611 int i, nops;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1612 expr_ty expr1, expr2, result;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1613 operator_ty newoperator;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1614
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1615 expr1 = ast_for_expr(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1616 if (!expr1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1617 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1618
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1619 expr2 = ast_for_expr(c, CHILD(n, 2));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1620 if (!expr2)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1621 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1622
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1623 newoperator = get_operator(CHILD(n, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1624 if (!newoperator)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1625 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1626
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1627 result = BinOp(expr1, newoperator, expr2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1628 c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1629 if (!result)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1630 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1631
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1632 nops = (NCH(n) - 1) / 2;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1633 for (i = 1; i < nops; i++) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1634 expr_ty tmp_result, tmp;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1635 const node* next_oper = CHILD(n, i * 2 + 1);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1636
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1637 newoperator = get_operator(next_oper);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1638 if (!newoperator)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1639 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1640
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1641 tmp = ast_for_expr(c, CHILD(n, i * 2 + 2));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1642 if (!tmp)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1643 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1644
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1645 tmp_result = BinOp(result, newoperator, tmp,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1646 LINENO(next_oper), next_oper->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1647 c->c_arena);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1648 if (!tmp_result)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1649 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1650 result = tmp_result;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1651 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1652 return result;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1653 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1654
35799
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1655 static expr_ty
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1656 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
1657 {
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1658 /* trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
36686
8611f39cd82b Fix parsing of subscriptlist.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36682
diff changeset
1659 subscriptlist: subscript (',' subscript)* [',']
8611f39cd82b Fix parsing of subscriptlist.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36682
diff changeset
1660 subscript: '.' '.' '.' | test | [test] ':' [test] [sliceop]
8611f39cd82b Fix parsing of subscriptlist.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36682
diff changeset
1661 */
35799
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1662 REQ(n, trailer);
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1663 if (TYPE(CHILD(n, 0)) == LPAR) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1664 if (NCH(n) == 2)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1665 return Call(left_expr, NULL, NULL, NULL, NULL, LINENO(n),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1666 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1667 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1668 return ast_for_call(c, CHILD(n, 1), left_expr);
35799
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1669 }
36679
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36676
diff changeset
1670 else if (TYPE(CHILD(n, 0)) == DOT ) {
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
1671 PyObject *attr_id = NEW_IDENTIFIER(CHILD(n, 1));
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
1672 if (!attr_id)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
1673 return NULL;
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
1674 return Attribute(left_expr, attr_id, Load,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1675 LINENO(n), n->n_col_offset, c->c_arena);
36679
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36676
diff changeset
1676 }
e1391910b026 Simplify ast_for_trailer() in anticipation of more changes.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 36676
diff changeset
1677 else {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1678 REQ(CHILD(n, 0), LSQB);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1679 REQ(CHILD(n, 2), RSQB);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1680 n = CHILD(n, 1);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1681 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1682 slice_ty slc = ast_for_slice(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1683 if (!slc)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1684 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1685 return Subscript(left_expr, slc, Load, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1686 c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1687 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1688 else {
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1689 /* The grammar is ambiguous here. The ambiguity is resolved
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1690 by treating the sequence as a tuple literal if there are
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1691 no slice features.
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1692 */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1693 int j;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1694 slice_ty slc;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1695 expr_ty e;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1696 bool simple = true;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1697 asdl_seq *slices, *elts;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1698 slices = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1699 if (!slices)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1700 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1701 for (j = 0; j < NCH(n); j += 2) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1702 slc = ast_for_slice(c, CHILD(n, j));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1703 if (!slc)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1704 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1705 if (slc->kind != Index_kind)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1706 simple = false;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1707 asdl_seq_SET(slices, j / 2, slc);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1708 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1709 if (!simple) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1710 return Subscript(left_expr, ExtSlice(slices, c->c_arena),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1711 Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1712 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1713 /* extract Index values and put them in a Tuple */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1714 elts = asdl_seq_new(asdl_seq_LEN(slices), c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1715 if (!elts)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1716 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1717 for (j = 0; j < asdl_seq_LEN(slices); ++j) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1718 slc = (slice_ty)asdl_seq_GET(slices, j);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1719 assert(slc->kind == Index_kind && slc->v.Index.value);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1720 asdl_seq_SET(elts, j, slc->v.Index.value);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1721 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1722 e = Tuple(elts, Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1723 if (!e)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1724 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1725 return Subscript(left_expr, Index(e, c->c_arena),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1726 Load, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1727 }
35799
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1728 }
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1729 }
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1730
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1731 static expr_ty
39038
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1732 ast_for_factor(struct compiling *c, const node *n)
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1733 {
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1734 node *pfactor, *ppower, *patom, *pnum;
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1735 expr_ty expression;
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1736
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1737 /* If the unary - operator is applied to a constant, don't generate
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1738 a UNARY_NEGATIVE opcode. Just store the approriate value as a
39038
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1739 constant. The peephole optimizer already does something like
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1740 this but it doesn't handle the case where the constant is
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1741 (sys.maxint - 1). In that case, we want a PyIntObject, not a
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1742 PyLongObject.
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1743 */
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1744 if (TYPE(CHILD(n, 0)) == MINUS &&
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1745 NCH(n) == 2 &&
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1746 TYPE((pfactor = CHILD(n, 1))) == factor &&
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1747 NCH(pfactor) == 1 &&
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1748 TYPE((ppower = CHILD(pfactor, 0))) == power &&
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1749 NCH(ppower) == 1 &&
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1750 TYPE((patom = CHILD(ppower, 0))) == atom &&
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1751 TYPE((pnum = CHILD(patom, 0))) == NUMBER) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1752 char *s = PyObject_MALLOC(strlen(STR(pnum)) + 2);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1753 if (s == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1754 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1755 s[0] = '-';
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1756 strcpy(s + 1, STR(pnum));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1757 PyObject_FREE(STR(pnum));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1758 STR(pnum) = s;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1759 return ast_for_atom(c, patom);
39038
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1760 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1761
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1762 expression = ast_for_expr(c, CHILD(n, 1));
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1763 if (!expression)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1764 return NULL;
39038
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1765
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1766 switch (TYPE(CHILD(n, 0))) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1767 case PLUS:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1768 return UnaryOp(UAdd, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1769 c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1770 case MINUS:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1771 return UnaryOp(USub, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1772 c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1773 case TILDE:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1774 return UnaryOp(Invert, expression, LINENO(n),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1775 n->n_col_offset, c->c_arena);
39038
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1776 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1777 PyErr_Format(PyExc_SystemError, "unhandled factor: %d",
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1778 TYPE(CHILD(n, 0)));
39038
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1779 return NULL;
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1780 }
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1781
64ccd745ea92 Fix SF bug 1441486: bad unary minus folding in compiler.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 39037
diff changeset
1782 static expr_ty
35799
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1783 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
1784 {
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1785 /* power: atom trailer* ('**' factor)*
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1786 */
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1787 int i;
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1788 expr_ty e, tmp;
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1789 REQ(n, power);
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1790 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
1791 if (!e)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1792 return NULL;
35799
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1793 if (NCH(n) == 1)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1794 return e;
35799
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1795 for (i = 1; i < NCH(n); i++) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1796 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1797 if (TYPE(ch) != trailer)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1798 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1799 tmp = ast_for_trailer(c, ch, e);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1800 if (!tmp)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1801 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1802 tmp->lineno = e->lineno;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1803 tmp->col_offset = e->col_offset;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1804 e = tmp;
35799
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1805 }
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1806 if (TYPE(CHILD(n, NCH(n) - 1)) == factor) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1807 expr_ty f = ast_for_expr(c, CHILD(n, NCH(n) - 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1808 if (!f)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1809 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1810 tmp = BinOp(e, Pow, f, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1811 if (!tmp)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1812 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1813 e = tmp;
35799
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1814 }
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1815 return e;
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1816 }
842caa245917 Refactor code for translating "power" nodes.
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35798
diff changeset
1817
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1818 /* Do not name a variable 'expr'! Will cause a compile error.
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1819 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1820
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1821 static expr_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1822 ast_for_expr(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1823 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1824 /* 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
1825 test: or_test ['if' or_test 'else' test] | lambdef
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1826 or_test: and_test ('or' and_test)*
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1827 and_test: not_test ('and' not_test)*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1828 not_test: 'not' not_test | comparison
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1829 comparison: expr (comp_op expr)*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1830 expr: xor_expr ('|' xor_expr)*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1831 xor_expr: and_expr ('^' and_expr)*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1832 and_expr: shift_expr ('&' shift_expr)*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1833 shift_expr: arith_expr (('<<'|'>>') arith_expr)*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1834 arith_expr: term (('+'|'-') term)*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1835 term: factor (('*'|'/'|'%'|'//') factor)*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1836 factor: ('+'|'-'|'~') factor | power
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1837 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
1838
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It
Thomas Wouters <thomas@python.org>
parents: 36444
diff changeset
1839 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
1840 to explicitly allow:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It
Thomas Wouters <thomas@python.org>
parents: 36444
diff changeset
1841 [ 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
1842 (which would be ambiguous without these extra rules)
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1843
36666
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It
Thomas Wouters <thomas@python.org>
parents: 36444
diff changeset
1844 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
1845 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
1846
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1847 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1848
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1849 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1850 int i;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1851
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1852 loop:
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1853 switch (TYPE(n)) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1854 case test:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1855 case old_test:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1856 if (TYPE(CHILD(n, 0)) == lambdef ||
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1857 TYPE(CHILD(n, 0)) == old_lambdef)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1858 return ast_for_lambdef(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1859 else if (NCH(n) > 1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1860 return ast_for_ifexpr(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1861 /* Fallthrough */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1862 case or_test:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1863 case and_test:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1864 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1865 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1866 goto loop;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1867 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1868 seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1869 if (!seq)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1870 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1871 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1872 expr_ty e = ast_for_expr(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1873 if (!e)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1874 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1875 asdl_seq_SET(seq, i / 2, e);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1876 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1877 if (!strcmp(STR(CHILD(n, 1)), "and"))
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1878 return BoolOp(And, seq, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1879 c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1880 assert(!strcmp(STR(CHILD(n, 1)), "or"));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1881 return BoolOp(Or, seq, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1882 case not_test:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1883 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1884 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1885 goto loop;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1886 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1887 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1888 expr_ty expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1889 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1890 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1891
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1892 return UnaryOp(Not, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1893 c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1894 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1895 case comparison:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1896 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1897 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1898 goto loop;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1899 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1900 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1901 expr_ty expression;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1902 asdl_int_seq *ops;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1903 asdl_seq *cmps;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1904 ops = asdl_int_seq_new(NCH(n) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1905 if (!ops)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1906 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1907 cmps = asdl_seq_new(NCH(n) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1908 if (!cmps) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1909 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1910 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1911 for (i = 1; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1912 cmpop_ty newoperator;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1913
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
1914 newoperator = ast_for_comp_op(c, CHILD(n, i));
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1915 if (!newoperator) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1916 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1917 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1918
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1919 expression = ast_for_expr(c, CHILD(n, i + 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1920 if (!expression) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1921 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1922 }
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1923
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1924 asdl_seq_SET(ops, i / 2, newoperator);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1925 asdl_seq_SET(cmps, i / 2, expression);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1926 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1927 expression = ast_for_expr(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1928 if (!expression) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1929 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1930 }
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
1931
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1932 return Compare(expression, ops, cmps, LINENO(n),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1933 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1934 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1935 break;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1936
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1937 /* The next five cases all handle BinOps. The main body of code
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1938 is the same in each case, but the switch turned inside out to
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1939 reuse the code for each type of operator.
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1940 */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1941 case expr:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1942 case xor_expr:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1943 case and_expr:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1944 case shift_expr:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1945 case arith_expr:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1946 case term:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1947 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1948 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1949 goto loop;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1950 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1951 return ast_for_binop(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1952 case yield_expr: {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1953 expr_ty exp = NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1954 if (NCH(n) == 2) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1955 exp = ast_for_testlist(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1956 if (!exp)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1957 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1958 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1959 return Yield(exp, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1960 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1961 case factor:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1962 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1963 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1964 goto loop;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1965 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1966 return ast_for_factor(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1967 case power:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1968 return ast_for_power(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1969 default:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1970 PyErr_Format(PyExc_SystemError, "unhandled expr: %d", TYPE(n));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1971 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1972 }
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
1973 /* should never get here unless if error is set */
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1974 return NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1975 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1976
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1977 static expr_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1978 ast_for_call(struct compiling *c, const node *n, expr_ty func)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1979 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1980 /*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1981 arglist: (argument ',')* (argument [',']| '*' test [',' '**' test]
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1982 | '**' test)
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
1983 argument: [test '='] test [comp_for] # Really [keyword '='] test
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1984 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1985
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1986 int i, nargs, nkeywords, ngens;
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
1987 asdl_seq *args;
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
1988 asdl_seq *keywords;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1989 expr_ty vararg = NULL, kwarg = NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1990
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1991 REQ(n, arglist);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1992
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1993 nargs = 0;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1994 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1995 ngens = 0;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
1996 for (i = 0; i < NCH(n); i++) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1997 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1998 if (TYPE(ch) == argument) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
1999 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2000 nargs++;
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
2001 else if (TYPE(CHILD(ch, 1)) == comp_for)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2002 ngens++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2003 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2004 nkeywords++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2005 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2006 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2007 if (ngens > 1 || (ngens && (nargs || nkeywords))) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2008 ast_error(n, "Generator expression must be parenthesized "
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2009 "if not sole argument");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2010 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2011 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2012
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2013 if (nargs + nkeywords + ngens > 255) {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2014 ast_error(n, "more than 255 arguments");
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2015 return NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2016 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2017
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
2018 args = asdl_seq_new(nargs + ngens, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2019 if (!args)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2020 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
2021 keywords = asdl_seq_new(nkeywords, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2022 if (!keywords)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2023 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2024 nargs = 0;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2025 nkeywords = 0;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2026 for (i = 0; i < NCH(n); i++) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2027 node *ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2028 if (TYPE(ch) == argument) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2029 expr_ty e;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2030 if (NCH(ch) == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2031 if (nkeywords) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2032 ast_error(CHILD(ch, 0),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2033 "non-keyword arg after keyword arg");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2034 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2035 }
48307
49f52e285a64 allow keyword args to be passed in after *args #3473
Benjamin Peterson <benjamin@python.org>
parents: 47977
diff changeset
2036 if (vararg) {
49f52e285a64 allow keyword args to be passed in after *args #3473
Benjamin Peterson <benjamin@python.org>
parents: 47977
diff changeset
2037 ast_error(CHILD(ch, 0),
49f52e285a64 allow keyword args to be passed in after *args #3473
Benjamin Peterson <benjamin@python.org>
parents: 47977
diff changeset
2038 "only named arguments may follow *expression");
49f52e285a64 allow keyword args to be passed in after *args #3473
Benjamin Peterson <benjamin@python.org>
parents: 47977
diff changeset
2039 return NULL;
49f52e285a64 allow keyword args to be passed in after *args #3473
Benjamin Peterson <benjamin@python.org>
parents: 47977
diff changeset
2040 }
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2041 e = ast_for_expr(c, CHILD(ch, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2042 if (!e)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2043 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2044 asdl_seq_SET(args, nargs++, e);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2045 }
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
2046 else if (TYPE(CHILD(ch, 1)) == comp_for) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2047 e = ast_for_genexp(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2048 if (!e)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2049 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2050 asdl_seq_SET(args, nargs++, e);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2051 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2052 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2053 keyword_ty kw;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2054 identifier key;
47860
80109d4044cd #3219 repeated keyword arguments aren't allowed in function calls anymore
Benjamin Peterson <benjamin@python.org>
parents: 47587
diff changeset
2055 int k;
80109d4044cd #3219 repeated keyword arguments aren't allowed in function calls anymore
Benjamin Peterson <benjamin@python.org>
parents: 47587
diff changeset
2056 char *tmp;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2057
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2058 /* CHILD(ch, 0) is test, but must be an identifier? */
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2059 e = ast_for_expr(c, CHILD(ch, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2060 if (!e)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2061 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2062 /* f(lambda x: x[0] = 3) ends up getting parsed with
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2063 * LHS test = lambda x: x[0], and RHS test = 3.
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2064 * SF bug 132313 points out that complaining about a keyword
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2065 * then is very confusing.
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2066 */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2067 if (e->kind == Lambda_kind) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2068 ast_error(CHILD(ch, 0),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2069 "lambda cannot contain assignment");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2070 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2071 } else if (e->kind != Name_kind) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2072 ast_error(CHILD(ch, 0), "keyword can't be an expression");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2073 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2074 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2075 key = e->v.Name.id;
47523
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
2076 if (!forbidden_check(c, CHILD(ch, 0), PyBytes_AS_STRING(key)))
41974
c8b0e3b8b456 Disallow function calls like foo(None=1).
Georg Brandl <georg@python.org>
parents: 41773
diff changeset
2077 return NULL;
47860
80109d4044cd #3219 repeated keyword arguments aren't allowed in function calls anymore
Benjamin Peterson <benjamin@python.org>
parents: 47587
diff changeset
2078 for (k = 0; k < nkeywords; k++) {
80109d4044cd #3219 repeated keyword arguments aren't allowed in function calls anymore
Benjamin Peterson <benjamin@python.org>
parents: 47587
diff changeset
2079 tmp = PyString_AS_STRING(
80109d4044cd #3219 repeated keyword arguments aren't allowed in function calls anymore
Benjamin Peterson <benjamin@python.org>
parents: 47587
diff changeset
2080 ((keyword_ty)asdl_seq_GET(keywords, k))->arg);
80109d4044cd #3219 repeated keyword arguments aren't allowed in function calls anymore
Benjamin Peterson <benjamin@python.org>
parents: 47587
diff changeset
2081 if (!strcmp(tmp, PyString_AS_STRING(key))) {
80109d4044cd #3219 repeated keyword arguments aren't allowed in function calls anymore
Benjamin Peterson <benjamin@python.org>
parents: 47587
diff changeset
2082 ast_error(CHILD(ch, 0), "keyword argument repeated");
80109d4044cd #3219 repeated keyword arguments aren't allowed in function calls anymore
Benjamin Peterson <benjamin@python.org>
parents: 47587
diff changeset
2083 return NULL;
80109d4044cd #3219 repeated keyword arguments aren't allowed in function calls anymore
Benjamin Peterson <benjamin@python.org>
parents: 47587
diff changeset
2084 }
80109d4044cd #3219 repeated keyword arguments aren't allowed in function calls anymore
Benjamin Peterson <benjamin@python.org>
parents: 47587
diff changeset
2085 }
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2086 e = ast_for_expr(c, CHILD(ch, 2));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2087 if (!e)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2088 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2089 kw = keyword(key, e, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2090 if (!kw)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2091 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2092 asdl_seq_SET(keywords, nkeywords++, kw);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2093 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2094 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2095 else if (TYPE(ch) == STAR) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2096 vararg = ast_for_expr(c, CHILD(n, i+1));
45661
ff3e9aeaa692 Issue#2238: some syntax errors from *args or **kwargs expressions
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 45447
diff changeset
2097 if (!vararg)
ff3e9aeaa692 Issue#2238: some syntax errors from *args or **kwargs expressions
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 45447
diff changeset
2098 return NULL;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2099 i++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2100 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2101 else if (TYPE(ch) == DOUBLESTAR) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2102 kwarg = ast_for_expr(c, CHILD(n, i+1));
45661
ff3e9aeaa692 Issue#2238: some syntax errors from *args or **kwargs expressions
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 45447
diff changeset
2103 if (!kwarg)
ff3e9aeaa692 Issue#2238: some syntax errors from *args or **kwargs expressions
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents: 45447
diff changeset
2104 return NULL;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2105 i++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2106 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2107 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2108
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2109 return Call(func, args, keywords, vararg, kwarg, func->lineno,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2110 func->col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2111 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2112
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2113 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
2114 ast_for_testlist(struct compiling *c, const node* n)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2115 {
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
2116 /* testlist_comp: test (',' test)* [','] */
35798
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2117 /* 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
2118 /* 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
2119 /* testlist1: test (',' test)* */
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2120 assert(NCH(n) > 0);
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
2121 if (TYPE(n) == testlist_comp) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2122 if (NCH(n) > 1)
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
2123 assert(TYPE(CHILD(n, 1)) != comp_for);
35798
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2124 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2125 else {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2126 assert(TYPE(n) == testlist ||
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2127 TYPE(n) == testlist_safe ||
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2128 TYPE(n) == testlist1);
35798
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2129 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2130 if (NCH(n) == 1)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2131 return ast_for_expr(c, CHILD(n, 0));
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2132 else {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2133 asdl_seq *tmp = seq_for_testlist(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2134 if (!tmp)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2135 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2136 return Tuple(tmp, Load, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2137 }
35798
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2138 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2139
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2140 static expr_ty
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
2141 ast_for_testlist_comp(struct compiling *c, const node* n)
35798
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2142 {
58250
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
2143 /* testlist_comp: test ( comp_for | (',' test)* [','] ) */
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
2144 /* argument: test [ comp_for ] */
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
2145 assert(TYPE(n) == testlist_comp || TYPE(n) == argument);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax.
Alexandre Vassalotti <alexandre@peadrop.com>
parents: 58229
diff changeset
2146 if (NCH(n) > 1 && TYPE(CHILD(n, 1)) == comp_for)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2147 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
2148 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
2149 }
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2150
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2151 /* 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
2152 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
2153 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
2154 {
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2155 /* 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
2156 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
2157 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
2158 if (NCH(n) == 1) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2159 expr_ty base;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2160 asdl_seq *bases = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2161 if (!bases)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2162 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2163 base = ast_for_expr(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2164 if (!base)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2165 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2166 asdl_seq_SET(bases, 0, base);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2167 return bases;
35798
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2168 }
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2169
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2170 return seq_for_testlist(c, n);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2171 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2172
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2173 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2174 ast_for_expr_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2175 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2176 REQ(n, expr_stmt);
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2177 /* expr_stmt: testlist (augassign (yield_expr|testlist)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2178 | ('=' (yield_expr|testlist))*)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2179 testlist: test (',' test)* [',']
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2180 augassign: '+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^='
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2181 | '<<=' | '>>=' | '**=' | '//='
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2182 test: ... here starts the operator precendence dance
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2183 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2184
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2185 if (NCH(n) == 1) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2186 expr_ty e = ast_for_testlist(c, CHILD(n, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2187 if (!e)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2188 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2189
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2190 return Expr(e, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2191 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2192 else if (TYPE(CHILD(n, 1)) == augassign) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2193 expr_ty expr1, expr2;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2194 operator_ty newoperator;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2195 node *ch = CHILD(n, 0);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2196
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2197 expr1 = ast_for_testlist(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2198 if (!expr1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2199 return NULL;
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
2200 if(!set_context(c, expr1, Store, ch))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2201 return NULL;
56361
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2202 /* set_context checks that most expressions are not the left side.
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2203 Augmented assignments can only have a name, a subscript, or an
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2204 attribute on the left, though, so we have to explicitly check for
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2205 those. */
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2206 switch (expr1->kind) {
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2207 case Name_kind:
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2208 case Attribute_kind:
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2209 case Subscript_kind:
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2210 break;
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2211 default:
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2212 ast_error(ch, "illegal expression for augmented assignment");
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2213 return NULL;
cceb62eb1cf1 #7050 fix a SystemError when using tuple unpacking and augmented assignment
Benjamin Peterson <benjamin@python.org>
parents: 55651
diff changeset
2214 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2215
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2216 ch = CHILD(n, 2);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2217 if (TYPE(ch) == testlist)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2218 expr2 = ast_for_testlist(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2219 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2220 expr2 = ast_for_expr(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2221 if (!expr2)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2222 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2223
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
2224 newoperator = ast_for_augassign(c, CHILD(n, 1));
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2225 if (!newoperator)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2226 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2227
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2228 return AugAssign(expr1, newoperator, expr2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2229 c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2230 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2231 else {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2232 int i;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2233 asdl_seq *targets;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2234 node *value;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2235 expr_ty expression;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2236
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2237 /* a normal assignment */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2238 REQ(CHILD(n, 1), EQUAL);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2239 targets = asdl_seq_new(NCH(n) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2240 if (!targets)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2241 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2242 for (i = 0; i < NCH(n) - 2; i += 2) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2243 expr_ty e;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2244 node *ch = CHILD(n, i);
54689
027444810e3f revert r73361
Benjamin Peterson <benjamin@python.org>
parents: 54688
diff changeset
2245 if (TYPE(ch) == yield_expr) {
027444810e3f revert r73361
Benjamin Peterson <benjamin@python.org>
parents: 54688
diff changeset
2246 ast_error(ch, "assignment to yield expression not possible");
027444810e3f revert r73361
Benjamin Peterson <benjamin@python.org>
parents: 54688
diff changeset
2247 return NULL;
027444810e3f revert r73361
Benjamin Peterson <benjamin@python.org>
parents: 54688
diff changeset
2248 }
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2249 e = ast_for_testlist(c, ch);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2250
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2251 /* set context to assign */
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2252 if (!e)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2253 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2254
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
2255 if (!set_context(c, e, Store, CHILD(n, i)))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2256 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2257
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2258 asdl_seq_SET(targets, i / 2, e);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2259 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2260 value = CHILD(n, NCH(n) - 1);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2261 if (TYPE(value) == testlist)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2262 expression = ast_for_testlist(c, value);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2263 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2264 expression = ast_for_expr(c, value);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2265 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2266 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2267 return Assign(targets, expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2268 c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2269 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2270 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2271
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2272 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2273 ast_for_print_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2274 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2275 /* print_stmt: 'print' ( [ test (',' test)* [','] ]
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2276 | '>>' test [ (',' test)+ [','] ] )
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2277 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2278 expr_ty dest = NULL, expression;
54741
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2279 asdl_seq *seq = NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2280 bool nl;
54741
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2281 int i, j, values_count, start = 1;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2282
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2283 REQ(n, print_stmt);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2284 if (NCH(n) >= 2 && TYPE(CHILD(n, 1)) == RIGHTSHIFT) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2285 dest = ast_for_expr(c, CHILD(n, 2));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2286 if (!dest)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2287 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2288 start = 4;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2289 }
54741
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2290 values_count = (NCH(n) + 1 - start) / 2;
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2291 if (values_count) {
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2292 seq = asdl_seq_new(values_count, c->c_arena);
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2293 if (!seq)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2294 return NULL;
54741
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2295 for (i = start, j = 0; i < NCH(n); i += 2, ++j) {
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2296 expression = ast_for_expr(c, CHILD(n, i));
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2297 if (!expression)
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2298 return NULL;
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2299 asdl_seq_SET(seq, j, expression);
cb66473cbbf8 set Print.values to NULL if there are no values
Benjamin Peterson <benjamin@python.org>
parents: 54732
diff changeset
2300 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2301 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2302 nl = (TYPE(CHILD(n, NCH(n) - 1)) == COMMA) ? false : true;
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
2303 return Print(dest, seq, nl, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2304 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2305
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2306 static asdl_seq *
37604
c732f66c913f Convert 0 to their respective enum types. Convert
Martin v. Löwis <martin@v.loewis.de>
parents: 37597
diff changeset
2307 ast_for_exprlist(struct compiling *c, const node *n, expr_context_ty context)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2308 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2309 asdl_seq *seq;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2310 int i;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2311 expr_ty e;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2312
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2313 REQ(n, exprlist);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2314
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
2315 seq = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2316 if (!seq)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2317 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2318 for (i = 0; i < NCH(n); i += 2) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2319 e = ast_for_expr(c, CHILD(n, i));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2320 if (!e)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2321 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2322 asdl_seq_SET(seq, i / 2, e);
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
2323 if (context && !set_context(c, e, context, CHILD(n, i)))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2324 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2325 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2326 return seq;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2327 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2328
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2329 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2330 ast_for_del_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2331 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2332 asdl_seq *expr_list;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2333
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2334 /* del_stmt: 'del' exprlist */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2335 REQ(n, del_stmt);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2336
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2337 expr_list = ast_for_exprlist(c, CHILD(n, 1), Del);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2338 if (!expr_list)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2339 return NULL;
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
2340 return Delete(expr_list, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2341 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2342
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2343 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2344 ast_for_flow_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2345 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2346 /*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2347 flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2348 | yield_stmt
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2349 break_stmt: 'break'
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2350 continue_stmt: 'continue'
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2351 return_stmt: 'return' [testlist]
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2352 yield_stmt: yield_expr
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2353 yield_expr: 'yield' testlist
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2354 raise_stmt: 'raise' [test [',' test [',' test]]]
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2355 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2356 node *ch;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2357
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2358 REQ(n, flow_stmt);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2359 ch = CHILD(n, 0);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2360 switch (TYPE(ch)) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2361 case break_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2362 return Break(LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2363 case continue_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2364 return Continue(LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2365 case yield_stmt: { /* will reduce to yield_expr */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2366 expr_ty exp = ast_for_expr(c, CHILD(ch, 0));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2367 if (!exp)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2368 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2369 return Expr(exp, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2370 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2371 case return_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2372 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2373 return Return(NULL, LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2374 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2375 expr_ty expression = ast_for_testlist(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2376 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2377 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2378 return Return(expression, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2379 c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2380 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2381 case raise_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2382 if (NCH(ch) == 1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2383 return Raise(NULL, NULL, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2384 c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2385 else if (NCH(ch) == 2) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2386 expr_ty expression = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2387 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2388 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2389 return Raise(expression, NULL, NULL, LINENO(n),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2390 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2391 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2392 else if (NCH(ch) == 4) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2393 expr_ty expr1, expr2;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2394
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2395 expr1 = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2396 if (!expr1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2397 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2398 expr2 = ast_for_expr(c, CHILD(ch, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2399 if (!expr2)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2400 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2401
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2402 return Raise(expr1, expr2, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2403 c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2404 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2405 else if (NCH(ch) == 6) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2406 expr_ty expr1, expr2, expr3;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2407
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2408 expr1 = ast_for_expr(c, CHILD(ch, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2409 if (!expr1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2410 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2411 expr2 = ast_for_expr(c, CHILD(ch, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2412 if (!expr2)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2413 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2414 expr3 = ast_for_expr(c, CHILD(ch, 5));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2415 if (!expr3)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2416 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2417
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2418 return Raise(expr1, expr2, expr3, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2419 c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2420 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2421 default:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2422 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2423 "unexpected flow_stmt: %d", TYPE(ch));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2424 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2425 }
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2426
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2427 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
2428 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2429 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2430
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2431 static alias_ty
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2432 alias_for_import_name(struct compiling *c, const node *n, int store)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2433 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2434 /*
36742
658f8ff2a442 Make 'as' an actual keyword when with's future statement is used. Not
Thomas Wouters <thomas@python.org>
parents: 36718
diff changeset
2435 import_as_name: NAME ['as' NAME]
658f8ff2a442 Make 'as' an actual keyword when with's future statement is used. Not
Thomas Wouters <thomas@python.org>
parents: 36718
diff changeset
2436 dotted_as_name: dotted_name ['as' NAME]
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2437 dotted_name: NAME ('.' NAME)*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2438 */
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2439 PyObject *str, *name;
36065
ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines,
Neal Norwitz <nnorwitz@gmail.com>
parents: 36001
diff changeset
2440
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2441 loop:
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2442 switch (TYPE(n)) {
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2443 case import_as_name: {
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2444 node *name_node = CHILD(n, 0);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2445 str = NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2446 if (NCH(n) == 3) {
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2447 node *str_node = CHILD(n, 2);
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2448 if (store && !forbidden_check(c, str_node, STR(str_node)))
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2449 return NULL;
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2450 str = NEW_IDENTIFIER(str_node);
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2451 if (!str)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2452 return NULL;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2453 }
54732
04ccec0441b2 allow importing from a module named None if it has an 'as' clause
Benjamin Peterson <benjamin@python.org>
parents: 54728
diff changeset
2454 else {
04ccec0441b2 allow importing from a module named None if it has an 'as' clause
Benjamin Peterson <benjamin@python.org>
parents: 54728
diff changeset
2455 if (!forbidden_check(c, name_node, STR(name_node)))
04ccec0441b2 allow importing from a module named None if it has an 'as' clause
Benjamin Peterson <benjamin@python.org>
parents: 54728
diff changeset
2456 return NULL;
04ccec0441b2 allow importing from a module named None if it has an 'as' clause
Benjamin Peterson <benjamin@python.org>
parents: 54728
diff changeset
2457 }
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2458 name = NEW_IDENTIFIER(name_node);
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2459 if (!name)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2460 return NULL;
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2461 return alias(name, str, c->c_arena);
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2462 }
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2463 case dotted_as_name:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2464 if (NCH(n) == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2465 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2466 goto loop;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2467 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2468 else {
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2469 node *asname_node = CHILD(n, 2);
54732
04ccec0441b2 allow importing from a module named None if it has an 'as' clause
Benjamin Peterson <benjamin@python.org>
parents: 54728
diff changeset
2470 alias_ty a = alias_for_import_name(c, CHILD(n, 0), 0);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2471 if (!a)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2472 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2473 assert(!a->asname);
54732
04ccec0441b2 allow importing from a module named None if it has an 'as' clause
Benjamin Peterson <benjamin@python.org>
parents: 54728
diff changeset
2474 if (!forbidden_check(c, asname_node, STR(asname_node)))
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2475 return NULL;
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2476 a->asname = NEW_IDENTIFIER(asname_node);
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2477 if (!a->asname)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2478 return NULL;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2479 return a;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2480 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2481 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2482 case dotted_name:
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2483 if (NCH(n) == 1) {
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2484 node *name_node = CHILD(n, 0);
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2485 if (store && !forbidden_check(c, name_node, STR(name_node)))
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2486 return NULL;
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2487 name = NEW_IDENTIFIER(name_node);
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2488 if (!name)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2489 return NULL;
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2490 return alias(name, NULL, c->c_arena);
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
2491 }
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2492 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2493 /* Create a string of the form "a.b.c" */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2494 int i;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2495 size_t len;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2496 char *s;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2497
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2498 len = 0;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2499 for (i = 0; i < NCH(n); i += 2)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2500 /* length of string plus one for the dot */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2501 len += strlen(STR(CHILD(n, i))) + 1;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2502 len--; /* the last name doesn't have a dot */
47527
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
2503 str = PyString_FromStringAndSize(NULL, len);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2504 if (!str)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2505 return NULL;
47527
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
2506 s = PyString_AS_STRING(str);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2507 if (!s)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2508 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2509 for (i = 0; i < NCH(n); i += 2) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2510 char *sch = STR(CHILD(n, i));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2511 strcpy(s, STR(CHILD(n, i)));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2512 s += strlen(sch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2513 *s++ = '.';
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2514 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2515 --s;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2516 *s = '\0';
47527
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
2517 PyString_InternInPlace(&str);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2518 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2519 return alias(str, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2520 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2521 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2522 case STAR:
47527
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
2523 str = PyString_InternFromString("*");
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2524 PyArena_AddPyObject(c->c_arena, str);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2525 return alias(str, NULL, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2526 default:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2527 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2528 "unexpected import name: %d", TYPE(n));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2529 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2530 }
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2531
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2532 PyErr_SetString(PyExc_SystemError, "unhandled import name condition");
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2533 return NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2534 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2535
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2536 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2537 ast_for_import_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2538 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2539 /*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2540 import_stmt: import_name | import_from
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2541 import_name: 'import' dotted_as_names
36712
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports.
Thomas Wouters <thomas@python.org>
parents: 36695
diff changeset
2542 import_from: 'from' ('.'* dotted_name | '.') 'import'
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2543 ('*' | '(' import_as_names ')' | import_as_names)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2544 */
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
2545 int lineno;
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
2546 int col_offset;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2547 int i;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2548 asdl_seq *aliases;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2549
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2550 REQ(n, import_stmt);
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
2551 lineno = LINENO(n);
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
2552 col_offset = n->n_col_offset;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2553 n = CHILD(n, 0);
36682
52cbc447e1c9 And some more cleanup.
Thomas Wouters <thomas@python.org>
parents: 36681
diff changeset
2554 if (TYPE(n) == import_name) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2555 n = CHILD(n, 1);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2556 REQ(n, dotted_as_names);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2557 aliases = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2558 if (!aliases)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2559 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2560 for (i = 0; i < NCH(n); i += 2) {
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2561 alias_ty import_alias = alias_for_import_name(c, CHILD(n, i), 1);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2562 if (!import_alias)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2563 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2564 asdl_seq_SET(aliases, i / 2, import_alias);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2565 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2566 return Import(aliases, lineno, col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2567 }
36682
52cbc447e1c9 And some more cleanup.
Thomas Wouters <thomas@python.org>
parents: 36681
diff changeset
2568 else if (TYPE(n) == import_from) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2569 int n_children;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2570 int idx, ndots = 0;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2571 alias_ty mod = NULL;
54743
40c8c35492f1 when no module is given in a 'from' relative import, make ImportFrom.module NULL
Benjamin Peterson <benjamin@python.org>
parents: 54742
diff changeset
2572 identifier modname = NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2573
36712
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports.
Thomas Wouters <thomas@python.org>
parents: 36695
diff changeset
2574 /* Count the number of dots (for relative imports) and check for the
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2575 optional module name */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2576 for (idx = 1; idx < NCH(n); idx++) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2577 if (TYPE(CHILD(n, idx)) == dotted_name) {
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2578 mod = alias_for_import_name(c, CHILD(n, idx), 0);
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2579 if (!mod)
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2580 return NULL;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2581 idx++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2582 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2583 } else if (TYPE(CHILD(n, idx)) != DOT) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2584 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2585 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2586 ndots++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2587 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2588 idx++; /* skip over the 'import' keyword */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2589 switch (TYPE(CHILD(n, idx))) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2590 case STAR:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2591 /* from ... import * */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2592 n = CHILD(n, idx);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2593 n_children = 1;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2594 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2595 case LPAR:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2596 /* from ... import (x, y, z) */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2597 n = CHILD(n, idx + 1);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2598 n_children = NCH(n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2599 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2600 case import_as_names:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2601 /* from ... import x, y, z */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2602 n = CHILD(n, idx);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2603 n_children = NCH(n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2604 if (n_children % 2 == 0) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2605 ast_error(n, "trailing comma not allowed without"
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2606 " surrounding parentheses");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2607 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2608 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2609 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2610 default:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2611 ast_error(n, "Unexpected node-type in from-import");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2612 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2613 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2614
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2615 aliases = asdl_seq_new((n_children + 1) / 2, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2616 if (!aliases)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2617 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2618
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2619 /* handle "from ... import *" special b/c there's no children */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2620 if (TYPE(n) == STAR) {
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2621 alias_ty import_alias = alias_for_import_name(c, n, 1);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2622 if (!import_alias)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2623 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2624 asdl_seq_SET(aliases, 0, import_alias);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2625 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2626 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2627 for (i = 0; i < NCH(n); i += 2) {
54728
788e1397ce77 prevent import statements from assigning to None
Benjamin Peterson <benjamin@python.org>
parents: 54727
diff changeset
2628 alias_ty import_alias = alias_for_import_name(c, CHILD(n, i), 1);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2629 if (!import_alias)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2630 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2631 asdl_seq_SET(aliases, i / 2, import_alias);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2632 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2633 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2634 if (mod != NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2635 modname = mod->name;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2636 return ImportFrom(modname, aliases, ndots, lineno, col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2637 c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2638 }
35870
f531c05cd240 Convert all internal errors from Exception to SystemError
Neal Norwitz <nnorwitz@gmail.com>
parents: 35868
diff changeset
2639 PyErr_Format(PyExc_SystemError,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2640 "unknown import statement: starts with command '%s'",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2641 STR(CHILD(n, 0)));
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2642 return NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2643 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2644
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2645 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2646 ast_for_global_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2647 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2648 /* global_stmt: 'global' NAME (',' NAME)* */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2649 identifier name;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2650 asdl_seq *s;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2651 int i;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2652
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2653 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
2654 s = asdl_seq_new(NCH(n) / 2, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2655 if (!s)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2656 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2657 for (i = 1; i < NCH(n); i += 2) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2658 name = NEW_IDENTIFIER(CHILD(n, i));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2659 if (!name)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2660 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2661 asdl_seq_SET(s, i / 2, name);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2662 }
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
2663 return Global(s, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2664 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2665
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2666 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2667 ast_for_exec_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2668 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2669 expr_ty expr1, globals = NULL, locals = NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2670 int n_children = NCH(n);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2671 if (n_children != 2 && n_children != 4 && n_children != 6) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2672 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2673 "poorly formed 'exec' statement: %d parts to statement",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2674 n_children);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2675 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2676 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2677
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2678 /* exec_stmt: 'exec' expr ['in' test [',' test]] */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2679 REQ(n, exec_stmt);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2680 expr1 = ast_for_expr(c, CHILD(n, 1));
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2681 if (!expr1)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2682 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2683 if (n_children >= 4) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2684 globals = ast_for_expr(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2685 if (!globals)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2686 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2687 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2688 if (n_children == 6) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2689 locals = ast_for_expr(c, CHILD(n, 5));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2690 if (!locals)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2691 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2692 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2693
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2694 return Exec(expr1, globals, locals, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2695 c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2696 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2697
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2698 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2699 ast_for_assert_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2700 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2701 /* assert_stmt: 'assert' test [',' test] */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2702 REQ(n, assert_stmt);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2703 if (NCH(n) == 2) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2704 expr_ty expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2705 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2706 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2707 return Assert(expression, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2708 c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2709 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2710 else if (NCH(n) == 4) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2711 expr_ty expr1, expr2;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2712
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2713 expr1 = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2714 if (!expr1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2715 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2716 expr2 = ast_for_expr(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2717 if (!expr2)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2718 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2719
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2720 return Assert(expr1, expr2, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2721 }
35870
f531c05cd240 Convert all internal errors from Exception to SystemError
Neal Norwitz <nnorwitz@gmail.com>
parents: 35868
diff changeset
2722 PyErr_Format(PyExc_SystemError,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2723 "improper number of parts to 'assert' statement: %d",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2724 NCH(n));
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2725 return NULL;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2726 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2727
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2728 static asdl_seq *
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2729 ast_for_suite(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2730 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2731 /* 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
2732 asdl_seq *seq;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2733 stmt_ty s;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2734 int i, total, num, end, pos = 0;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2735 node *ch;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2736
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2737 REQ(n, suite);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2738
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2739 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
2740 seq = asdl_seq_new(total, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2741 if (!seq)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2742 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2743 if (TYPE(CHILD(n, 0)) == simple_stmt) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2744 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2745 /* simple_stmt always ends with a NEWLINE,
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2746 and may have a trailing SEMI
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2747 */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2748 end = NCH(n) - 1;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2749 if (TYPE(CHILD(n, end - 1)) == SEMI)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2750 end--;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2751 /* loop by 2 to skip semi-colons */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2752 for (i = 0; i < end; i += 2) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2753 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2754 s = ast_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2755 if (!s)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2756 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2757 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2758 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2759 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2760 else {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2761 for (i = 2; i < (NCH(n) - 1); i++) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2762 ch = CHILD(n, i);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2763 REQ(ch, stmt);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2764 num = num_stmts(ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2765 if (num == 1) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2766 /* small_stmt or compound_stmt with only one child */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2767 s = ast_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2768 if (!s)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2769 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2770 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2771 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2772 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2773 int j;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2774 ch = CHILD(ch, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2775 REQ(ch, simple_stmt);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2776 for (j = 0; j < NCH(ch); j += 2) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2777 /* statement terminates with a semi-colon ';' */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2778 if (NCH(CHILD(ch, j)) == 0) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2779 assert((j + 1) == NCH(ch));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2780 break;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2781 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2782 s = ast_for_stmt(c, CHILD(ch, j));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2783 if (!s)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2784 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2785 asdl_seq_SET(seq, pos++, s);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2786 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2787 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2788 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2789 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2790 assert(pos == seq->size);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2791 return seq;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2792 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2793
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2794 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2795 ast_for_if_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2796 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2797 /* if_stmt: 'if' test ':' suite ('elif' test ':' suite)*
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2798 ['else' ':' suite]
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2799 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2800 char *s;
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2801
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2802 REQ(n, if_stmt);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2803
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2804 if (NCH(n) == 4) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2805 expr_ty expression;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2806 asdl_seq *suite_seq;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2807
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2808 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2809 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2810 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2811 suite_seq = ast_for_suite(c, CHILD(n, 3));
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2812 if (!suite_seq)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2813 return NULL;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2814
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2815 return If(expression, suite_seq, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2816 c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2817 }
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2818
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2819 s = STR(CHILD(n, 4));
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2820 /* s[2], the third character in the string, will be
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2821 's' for el_s_e, or
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2822 'i' for el_i_f
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2823 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2824 if (s[2] == 's') {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2825 expr_ty expression;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2826 asdl_seq *seq1, *seq2;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2827
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2828 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2829 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2830 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2831 seq1 = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2832 if (!seq1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2833 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2834 seq2 = ast_for_suite(c, CHILD(n, 6));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2835 if (!seq2)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2836 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2837
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2838 return If(expression, seq1, seq2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2839 c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2840 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2841 else if (s[2] == 'i') {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2842 int i, n_elif, has_else = 0;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2843 expr_ty expression;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2844 asdl_seq *suite_seq;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2845 asdl_seq *orelse = NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2846 n_elif = NCH(n) - 4;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2847 /* must reference the child n_elif+1 since 'else' token is third,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2848 not fourth, child from the end. */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2849 if (TYPE(CHILD(n, (n_elif + 1))) == NAME
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2850 && STR(CHILD(n, (n_elif + 1)))[2] == 's') {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2851 has_else = 1;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2852 n_elif -= 3;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2853 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2854 n_elif /= 4;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2855
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2856 if (has_else) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2857 asdl_seq *suite_seq2;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2858
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2859 orelse = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2860 if (!orelse)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2861 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2862 expression = ast_for_expr(c, CHILD(n, NCH(n) - 6));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2863 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2864 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2865 suite_seq = ast_for_suite(c, CHILD(n, NCH(n) - 4));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2866 if (!suite_seq)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2867 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2868 suite_seq2 = ast_for_suite(c, CHILD(n, NCH(n) - 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2869 if (!suite_seq2)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2870 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2871
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2872 asdl_seq_SET(orelse, 0,
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2873 If(expression, suite_seq, suite_seq2,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2874 LINENO(CHILD(n, NCH(n) - 6)),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2875 CHILD(n, NCH(n) - 6)->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2876 c->c_arena));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2877 /* the just-created orelse handled the last elif */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2878 n_elif--;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2879 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2880
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2881 for (i = 0; i < n_elif; i++) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2882 int off = 5 + (n_elif - i - 1) * 4;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2883 asdl_seq *newobj = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2884 if (!newobj)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2885 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2886 expression = ast_for_expr(c, CHILD(n, off));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2887 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2888 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2889 suite_seq = ast_for_suite(c, CHILD(n, off + 2));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2890 if (!suite_seq)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2891 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2892
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2893 asdl_seq_SET(newobj, 0,
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
2894 If(expression, suite_seq, orelse,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2895 LINENO(CHILD(n, off)),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2896 CHILD(n, off)->n_col_offset, c->c_arena));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2897 orelse = newobj;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2898 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2899 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2900 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2901 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2902 suite_seq = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2903 if (!suite_seq)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2904 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2905 return If(expression, suite_seq, orelse,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2906 LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2907 }
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2908
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2909 PyErr_Format(PyExc_SystemError,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2910 "unexpected token in 'if' statement: %s", s);
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2911 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2912 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2913
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2914 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2915 ast_for_while_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2916 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2917 /* while_stmt: 'while' test ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2918 REQ(n, while_stmt);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2919
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2920 if (NCH(n) == 4) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2921 expr_ty expression;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2922 asdl_seq *suite_seq;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2923
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2924 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2925 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2926 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2927 suite_seq = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2928 if (!suite_seq)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2929 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2930 return While(expression, suite_seq, NULL, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2931 c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2932 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2933 else if (NCH(n) == 7) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2934 expr_ty expression;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2935 asdl_seq *seq1, *seq2;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2936
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2937 expression = ast_for_expr(c, CHILD(n, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2938 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2939 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2940 seq1 = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2941 if (!seq1)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2942 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2943 seq2 = ast_for_suite(c, CHILD(n, 6));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2944 if (!seq2)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2945 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2946
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2947 return While(expression, seq1, seq2, LINENO(n), n->n_col_offset,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2948 c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2949 }
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2950
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2951 PyErr_Format(PyExc_SystemError,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2952 "wrong number of tokens for 'while' statement: %d",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2953 NCH(n));
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2954 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2955 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2956
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2957 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2958 ast_for_for_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2959 {
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2960 asdl_seq *_target, *seq = NULL, *suite_seq;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2961 expr_ty expression;
55651
1e2877026435 better col_offsets for "for" statements with tuple unpacking #6704
Benjamin Peterson <benjamin@python.org>
parents: 55362
diff changeset
2962 expr_ty target, first;
39067
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
Neal Norwitz <nnorwitz@gmail.com>
parents: 39038
diff changeset
2963 const node *node_target;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2964 /* for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite] */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2965 REQ(n, for_stmt);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2966
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2967 if (NCH(n) == 9) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2968 seq = ast_for_suite(c, CHILD(n, 8));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2969 if (!seq)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2970 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2971 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2972
39067
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
Neal Norwitz <nnorwitz@gmail.com>
parents: 39038
diff changeset
2973 node_target = CHILD(n, 1);
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
Neal Norwitz <nnorwitz@gmail.com>
parents: 39038
diff changeset
2974 _target = ast_for_exprlist(c, node_target, Store);
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
2975 if (!_target)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2976 return NULL;
39067
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
Neal Norwitz <nnorwitz@gmail.com>
parents: 39038
diff changeset
2977 /* Check the # of children rather than the length of _target, since
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
Neal Norwitz <nnorwitz@gmail.com>
parents: 39038
diff changeset
2978 for x, in ... has 1 element in _target, but still requires a Tuple. */
55651
1e2877026435 better col_offsets for "for" statements with tuple unpacking #6704
Benjamin Peterson <benjamin@python.org>
parents: 55362
diff changeset
2979 first = (expr_ty)asdl_seq_GET(_target, 0);
39067
7182c2775c1e Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
Neal Norwitz <nnorwitz@gmail.com>
parents: 39038
diff changeset
2980 if (NCH(node_target) == 1)
55651
1e2877026435 better col_offsets for "for" statements with tuple unpacking #6704
Benjamin Peterson <benjamin@python.org>
parents: 55362
diff changeset
2981 target = first;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2982 else
55651
1e2877026435 better col_offsets for "for" statements with tuple unpacking #6704
Benjamin Peterson <benjamin@python.org>
parents: 55362
diff changeset
2983 target = Tuple(_target, Store, first->lineno, first->col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2984
35798
857f68fba275 Write a separate ast_for_testlist_gexp() function instead of overloading
Neil Schemenauer <nascheme@enme.ucalgary.ca>
parents: 35771
diff changeset
2985 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
2986 if (!expression)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2987 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2988 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
2989 if (!suite_seq)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2990 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2991
37453
16a64e394602 Add lineno, col_offset to excephandler to enable future fix for
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 37235
diff changeset
2992 return For(target, expression, suite_seq, seq, LINENO(n), n->n_col_offset,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
2993 c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2994 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2995
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2996 static excepthandler_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2997 ast_for_except_clause(struct compiling *c, const node *exc, node *body)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
2998 {
41773
f19e631be101 Backport PEP 3110's new 'except' syntax to 2.6.
Collin Winter <collinw@gmail.com>
parents: 41579
diff changeset
2999 /* except_clause: 'except' [test [(',' | 'as') test]] */
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3000 REQ(exc, except_clause);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3001 REQ(body, suite);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3002
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3003 if (NCH(exc) == 1) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3004 asdl_seq *suite_seq = ast_for_suite(c, body);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3005 if (!suite_seq)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3006 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3007
46200
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum.
Georg Brandl <georg@python.org>
parents: 46118
diff changeset
3008 return ExceptHandler(NULL, NULL, suite_seq, LINENO(exc),
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3009 exc->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3010 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3011 else if (NCH(exc) == 2) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3012 expr_ty expression;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3013 asdl_seq *suite_seq;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3014
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3015 expression = ast_for_expr(c, CHILD(exc, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3016 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3017 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3018 suite_seq = ast_for_suite(c, body);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3019 if (!suite_seq)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3020 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3021
46200
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum.
Georg Brandl <georg@python.org>
parents: 46118
diff changeset
3022 return ExceptHandler(expression, NULL, suite_seq, LINENO(exc),
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3023 exc->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3024 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3025 else if (NCH(exc) == 4) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3026 asdl_seq *suite_seq;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3027 expr_ty expression;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3028 expr_ty e = ast_for_expr(c, CHILD(exc, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3029 if (!e)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3030 return NULL;
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
3031 if (!set_context(c, e, Store, CHILD(exc, 3)))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3032 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3033 expression = ast_for_expr(c, CHILD(exc, 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3034 if (!expression)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3035 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3036 suite_seq = ast_for_suite(c, body);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3037 if (!suite_seq)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3038 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3039
46200
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum.
Georg Brandl <georg@python.org>
parents: 46118
diff changeset
3040 return ExceptHandler(expression, e, suite_seq, LINENO(exc),
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3041 exc->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3042 }
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
3043
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
3044 PyErr_Format(PyExc_SystemError,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3045 "wrong number of children for 'except' clause: %d",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3046 NCH(exc));
36072
de16a85c3b4c Cleanup a bit and make things more consistent.
Neal Norwitz <nnorwitz@gmail.com>
parents: 36066
diff changeset
3047 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3048 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3049
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3050 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3051 ast_for_try_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3052 {
36066
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3053 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
3054 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
3055 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
3056
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3057 REQ(n, try_stmt);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3058
36066
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3059 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
3060 if (body == NULL)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3061 return NULL;
36066
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3062
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3063 if (TYPE(CHILD(n, nch - 3)) == NAME) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3064 if (strcmp(STR(CHILD(n, nch - 3)), "finally") == 0) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3065 if (nch >= 9 && TYPE(CHILD(n, nch - 6)) == NAME) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3066 /* we can assume it's an "else",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3067 because nch >= 9 for try-else-finally and
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3068 it would otherwise have a type of except_clause */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3069 orelse = ast_for_suite(c, CHILD(n, nch - 4));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3070 if (orelse == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3071 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3072 n_except--;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3073 }
36066
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3074
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3075 finally = ast_for_suite(c, CHILD(n, nch - 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3076 if (finally == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3077 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3078 n_except--;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3079 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3080 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3081 /* we can assume it's an "else",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3082 otherwise it would have a type of except_clause */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3083 orelse = ast_for_suite(c, CHILD(n, nch - 1));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3084 if (orelse == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3085 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3086 n_except--;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3087 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3088 }
36066
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3089 else if (TYPE(CHILD(n, nch - 3)) != except_clause) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3090 ast_error(n, "malformed 'try' statement");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3091 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3092 }
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
3093
36066
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3094 if (n_except > 0) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3095 int i;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3096 stmt_ty except_st;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3097 /* process except statements to create a try ... except */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3098 asdl_seq *handlers = asdl_seq_new(n_except, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3099 if (handlers == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3100 return NULL;
36066
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3101
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3102 for (i = 0; i < n_except; i++) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3103 excepthandler_ty e = ast_for_except_clause(c, CHILD(n, 3 + i * 3),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3104 CHILD(n, 5 + i * 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3105 if (!e)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3106 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3107 asdl_seq_SET(handlers, i, e);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3108 }
36066
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3109
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3110 except_st = TryExcept(body, handlers, orelse, LINENO(n),
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3111 n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3112 if (!finally)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3113 return except_st;
36066
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3114
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3115 /* if a 'finally' is present too, we nest the TryExcept within a
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3116 TryFinally to emulate try ... except ... finally */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3117 body = asdl_seq_new(1, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3118 if (body == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3119 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3120 asdl_seq_SET(body, 0, except_st);
36066
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3121 }
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3122
719ba02d2e2c SF patch #1355913, PEP 341 - Unification of try/except and try/finally
Neal Norwitz <nnorwitz@gmail.com>
parents: 36065
diff changeset
3123 /* 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
3124 assert(finally != NULL);
36786
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes.
Martin v. Löwis <martin@v.loewis.de>
parents: 36780
diff changeset
3125 return TryFinally(body, finally, LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3126 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3127
54337
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3128 /* with_item: test ['as' expr] */
36695
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36686
diff changeset
3129 static stmt_ty
54337
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3130 ast_for_with_item(struct compiling *c, const node *n, asdl_seq *content)
36695
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36686
diff changeset
3131 {
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36686
diff changeset
3132 expr_ty context_expr, optional_vars = NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36686
diff changeset
3133
54337
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3134 REQ(n, with_item);
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3135 context_expr = ast_for_expr(c, CHILD(n, 0));
41205
b43a52f71696 Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements.
Collin Winter <collinw@gmail.com>
parents: 40972
diff changeset
3136 if (!context_expr)
b43a52f71696 Patch #1642547: Fix an error/crash when encountering syntax errors in complex if statements.
Collin Winter <collinw@gmail.com>
parents: 40972
diff changeset
3137 return NULL;
54337
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3138 if (NCH(n) == 3) {
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3139 optional_vars = ast_for_expr(c, CHILD(n, 2));
36695
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36686
diff changeset
3140
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3141 if (!optional_vars) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3142 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3143 }
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
3144 if (!set_context(c, optional_vars, Store, n)) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3145 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3146 }
36695
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36686
diff changeset
3147 }
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36686
diff changeset
3148
54337
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3149 return With(context_expr, optional_vars, content, LINENO(n),
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3150 n->n_col_offset, c->c_arena);
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3151 }
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3152
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3153 /* with_stmt: 'with' with_item (',' with_item)* ':' suite */
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3154 static stmt_ty
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3155 ast_for_with_stmt(struct compiling *c, const node *n)
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3156 {
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3157 int i;
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3158 stmt_ty ret;
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3159 asdl_seq *inner;
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3160
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3161 REQ(n, with_stmt);
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3162
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3163 /* process the with items inside-out */
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3164 i = NCH(n) - 1;
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3165 /* the suite of the innermost with item is the suite of the with stmt */
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3166 inner = ast_for_suite(c, CHILD(n, i));
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3167 if (!inner)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3168 return NULL;
54337
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3169
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3170 for (;;) {
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3171 i -= 2;
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3172 ret = ast_for_with_item(c, CHILD(n, i), inner);
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3173 if (!ret)
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3174 return NULL;
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3175 /* was this the last item? */
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3176 if (i == 1)
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3177 break;
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3178 /* if not, wrap the result so far in a new sequence */
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3179 inner = asdl_seq_new(1, c->c_arena);
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3180 if (!inner)
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3181 return NULL;
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3182 asdl_seq_SET(inner, 0, ret);
36695
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36686
diff changeset
3183 }
54337
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3184
16759f62eb22 Allow multiple context managers in one with statement, as proposed
Georg Brandl <georg@python.org>
parents: 50830
diff changeset
3185 return ret;
36695
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36686
diff changeset
3186 }
b6d2f6fd3e11 PEP 343 -- the with-statement.
Guido van Rossum <guido@python.org>
parents: 36686
diff changeset
3187
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3188 static stmt_ty
45447
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
3189 ast_for_classdef(struct compiling *c, const node *n, asdl_seq *decorator_seq)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3190 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3191 /* classdef: 'class' NAME ['(' testlist ')'] ':' suite */
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3192 PyObject *classname;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3193 asdl_seq *bases, *s;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
3194
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3195 REQ(n, classdef);
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3196
47523
d56450db60a2 Warn about assigning to Py3k keywords (True and False)
Benjamin Peterson <benjamin@python.org>
parents: 47521
diff changeset
3197 if (!forbidden_check(c, n, STR(CHILD(n, 1))))
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3198 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3199
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3200 if (NCH(n) == 4) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3201 s = ast_for_suite(c, CHILD(n, 3));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3202 if (!s)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3203 return NULL;
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3204 classname = NEW_IDENTIFIER(CHILD(n, 1));
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3205 if (!classname)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3206 return NULL;
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3207 return ClassDef(classname, NULL, s, decorator_seq, LINENO(n),
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3208 n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3209 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3210 /* check for empty base list */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3211 if (TYPE(CHILD(n,3)) == RPAR) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3212 s = ast_for_suite(c, CHILD(n,5));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3213 if (!s)
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3214 return NULL;
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3215 classname = NEW_IDENTIFIER(CHILD(n, 1));
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3216 if (!classname)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3217 return NULL;
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3218 return ClassDef(classname, NULL, s, decorator_seq, LINENO(n),
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3219 n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3220 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3221
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3222 /* 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
3223 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
3224 if (!bases)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3225 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3226
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3227 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
3228 if (!s)
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3229 return NULL;
49842
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3230 classname = NEW_IDENTIFIER(CHILD(n, 1));
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3231 if (!classname)
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3232 return NULL;
ffad6c0f252e always check the return value of NEW_IDENTIFIER
Benjamin Peterson <benjamin@python.org>
parents: 49795
diff changeset
3233 return ClassDef(classname, bases, s, decorator_seq,
45447
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
3234 LINENO(n), n->n_col_offset, c->c_arena);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3235 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3236
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3237 static stmt_ty
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3238 ast_for_stmt(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3239 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3240 if (TYPE(n) == stmt) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3241 assert(NCH(n) == 1);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3242 n = CHILD(n, 0);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3243 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3244 if (TYPE(n) == simple_stmt) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3245 assert(num_stmts(n) == 1);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3246 n = CHILD(n, 0);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3247 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3248 if (TYPE(n) == small_stmt) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3249 n = CHILD(n, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3250 /* small_stmt: expr_stmt | print_stmt | del_stmt | pass_stmt
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3251 | flow_stmt | import_stmt | global_stmt | exec_stmt
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3252 | assert_stmt
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3253 */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3254 switch (TYPE(n)) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3255 case expr_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3256 return ast_for_expr_stmt(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3257 case print_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3258 return ast_for_print_stmt(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3259 case del_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3260 return ast_for_del_stmt(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3261 case pass_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3262 return Pass(LINENO(n), n->n_col_offset, c->c_arena);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3263 case flow_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3264 return ast_for_flow_stmt(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3265 case import_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3266 return ast_for_import_stmt(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3267 case global_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3268 return ast_for_global_stmt(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3269 case exec_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3270 return ast_for_exec_stmt(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3271 case assert_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3272 return ast_for_assert_stmt(c, n);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3273 default:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3274 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3275 "unhandled small_stmt: TYPE=%d NCH=%d\n",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3276 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3277 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3278 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3279 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3280 else {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3281 /* compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt
45447
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
3282 | funcdef | classdef | decorated
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3283 */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3284 node *ch = CHILD(n, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3285 REQ(n, compound_stmt);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3286 switch (TYPE(ch)) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3287 case if_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3288 return ast_for_if_stmt(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3289 case while_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3290 return ast_for_while_stmt(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3291 case for_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3292 return ast_for_for_stmt(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3293 case try_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3294 return ast_for_try_stmt(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3295 case with_stmt:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3296 return ast_for_with_stmt(c, ch);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3297 case funcdef:
45447
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
3298 return ast_for_funcdef(c, ch, NULL);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3299 case classdef:
45447
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
3300 return ast_for_classdef(c, ch, NULL);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
3301 case decorated:
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators
Christian Heimes <christian@cheimes.de>
parents: 44747
diff changeset
3302 return ast_for_decorated(c, ch);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3303 default:
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3304 PyErr_Format(PyExc_SystemError,
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3305 "unhandled small_stmt: TYPE=%d NCH=%d\n",
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3306 TYPE(n), NCH(n));
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3307 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3308 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3309 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3310 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3311
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3312 static PyObject *
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
3313 parsenumber(struct compiling *c, const char *s)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3314 {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3315 const char *end;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3316 long x;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3317 double dx;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3318 #ifndef WITHOUT_COMPLEX
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
3319 Py_complex complex;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3320 int imflag;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3321 #endif
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3322
50027
57b5c4639a5d Issue #4461: Safety check in parsenumber (ast.c)
Mark Dickinson <dickinsm@gmail.com>
parents: 49842
diff changeset
3323 assert(s != NULL);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3324 errno = 0;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3325 end = s + strlen(s) - 1;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3326 #ifndef WITHOUT_COMPLEX
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3327 imflag = *end == 'j' || *end == 'J';
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3328 #endif
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3329 if (*end == 'l' || *end == 'L')
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3330 return PyLong_FromString((char *)s, (char **)0, 0);
47977
c0ab2bafb264 Issue #3360: Fix incorrect parsing of "020000000000.0".
Mark Dickinson <dickinsm@gmail.com>
parents: 47860
diff changeset
3331 x = PyOS_strtol((char *)s, (char **)&end, 0);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3332 if (*end == '\0') {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3333 if (errno != 0)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3334 return PyLong_FromString((char *)s, (char **)0, 0);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3335 return PyInt_FromLong(x);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3336 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3337 /* XXX Huge floats may silently fail */
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3338 #ifndef WITHOUT_COMPLEX
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3339 if (imflag) {
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
3340 complex.real = 0.;
56856
e99adfc92dc2 Removed PyOS_ascii_atof from ast.c, as mentioned in issue 7117.
Eric Smith <eric@trueblade.com>
parents: 56361
diff changeset
3341 complex.imag = PyOS_string_to_double(s, (char **)&end, NULL);
e99adfc92dc2 Removed PyOS_ascii_atof from ast.c, as mentioned in issue 7117.
Eric Smith <eric@trueblade.com>
parents: 56361
diff changeset
3342 if (complex.imag == -1.0 && PyErr_Occurred())
e99adfc92dc2 Removed PyOS_ascii_atof from ast.c, as mentioned in issue 7117.
Eric Smith <eric@trueblade.com>
parents: 56361
diff changeset
3343 return NULL;
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
3344 return PyComplex_FromCComplex(complex);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3345 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3346 else
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3347 #endif
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3348 {
56856
e99adfc92dc2 Removed PyOS_ascii_atof from ast.c, as mentioned in issue 7117.
Eric Smith <eric@trueblade.com>
parents: 56361
diff changeset
3349 dx = PyOS_string_to_double(s, NULL, NULL);
e99adfc92dc2 Removed PyOS_ascii_atof from ast.c, as mentioned in issue 7117.
Eric Smith <eric@trueblade.com>
parents: 56361
diff changeset
3350 if (dx == -1.0 && PyErr_Occurred())
e99adfc92dc2 Removed PyOS_ascii_atof from ast.c, as mentioned in issue 7117.
Eric Smith <eric@trueblade.com>
parents: 56361
diff changeset
3351 return NULL;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3352 return PyFloat_FromDouble(dx);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3353 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3354 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3355
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3356 static PyObject *
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
3357 decode_utf8(struct compiling *c, const char **sPtr, const char *end, char* encoding)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3358 {
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3359 #ifndef Py_USING_UNICODE
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3360 Py_FatalError("decode_utf8 should not be called in this build.");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3361 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3362 #else
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3363 PyObject *u, *v;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3364 char *s, *t;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3365 t = s = (char *)*sPtr;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3366 /* while (s < end && *s != '\\') s++; */ /* inefficient for u".." */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3367 while (s < end && (*s & 0x80)) s++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3368 *sPtr = s;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3369 u = PyUnicode_DecodeUTF8(t, s - t, NULL);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3370 if (u == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3371 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3372 v = PyUnicode_AsEncodedString(u, encoding, NULL);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3373 Py_DECREF(u);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3374 return v;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3375 #endif
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3376 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3377
42459
dbfc3cf1522d Place #ifdef Py_USING_UNICODE around decode_unicode().
Georg Brandl <georg@python.org>
parents: 42308
diff changeset
3378 #ifdef Py_USING_UNICODE
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3379 static PyObject *
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
3380 decode_unicode(struct compiling *c, const char *s, size_t len, int rawmode, const char *encoding)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3381 {
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
3382 PyObject *v;
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
3383 PyObject *u = NULL;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3384 char *buf;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3385 char *p;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3386 const char *end;
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
3387 if (encoding != NULL && strcmp(encoding, "iso-8859-1")) {
47587
1c964ed35ef9 Merge in release25-maint r60793:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47527
diff changeset
3388 /* check for integer overflow */
56956
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3389 if (len > PY_SIZE_MAX / 6)
47587
1c964ed35ef9 Merge in release25-maint r60793:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47527
diff changeset
3390 return NULL;
56956
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3391 /* "<C3><A4>" (2 bytes) may become "\U000000E4" (10 bytes), or 1:5
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3392 "\ä" (3 bytes) may become "\u005c\U000000E4" (16 bytes), or ~1:6 */
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3393 u = PyString_FromStringAndSize((char *)NULL, len * 6);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3394 if (u == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3395 return NULL;
47527
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
3396 p = buf = PyString_AsString(u);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3397 end = s + len;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3398 while (s < end) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3399 if (*s == '\\') {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3400 *p++ = *s++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3401 if (*s & 0x80) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3402 strcpy(p, "u005c");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3403 p += 5;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3404 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3405 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3406 if (*s & 0x80) { /* XXX inefficient */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3407 PyObject *w;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3408 char *r;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3409 Py_ssize_t rn, i;
56956
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3410 w = decode_utf8(c, &s, end, "utf-32-be");
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3411 if (w == NULL) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3412 Py_DECREF(u);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3413 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3414 }
47527
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
3415 r = PyString_AsString(w);
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
3416 rn = PyString_Size(w);
56956
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3417 assert(rn % 4 == 0);
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3418 for (i = 0; i < rn; i += 4) {
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3419 sprintf(p, "\\U%02x%02x%02x%02x",
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3420 r[i + 0] & 0xFF,
56956
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3421 r[i + 1] & 0xFF,
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3422 r[i + 2] & 0xFF,
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3423 r[i + 3] & 0xFF);
844180b7e6ff do a backport of r75928
Benjamin Peterson <benjamin@python.org>
parents: 56856
diff changeset
3424 p += 10;
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3425 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3426 Py_DECREF(w);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3427 } else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3428 *p++ = *s++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3429 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3430 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3431 len = p - buf;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3432 s = buf;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3433 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3434 if (rawmode)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3435 v = PyUnicode_DecodeRawUnicodeEscape(s, len, NULL);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3436 else
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3437 v = PyUnicode_DecodeUnicodeEscape(s, len, NULL);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3438 Py_XDECREF(u);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3439 return v;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3440 }
42459
dbfc3cf1522d Place #ifdef Py_USING_UNICODE around decode_unicode().
Georg Brandl <georg@python.org>
parents: 42308
diff changeset
3441 #endif
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3442
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3443 /* s is a Python string literal, including the bracketing quote characters,
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3444 * and r &/or u prefixes (if any), and embedded escape sequences (if any).
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3445 * parsestr parses it, and returns the decoded Python string object.
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3446 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3447 static PyObject *
46118
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
3448 parsestr(struct compiling *c, const char *s)
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3449 {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3450 size_t len;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3451 int quote = Py_CHARMASK(*s);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3452 int rawmode = 0;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3453 int need_encoding;
46118
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
3454 int unicode = c->c_future_unicode;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3455
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3456 if (isalpha(quote) || quote == '_') {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3457 if (quote == 'u' || quote == 'U') {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3458 quote = *++s;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3459 unicode = 1;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3460 }
44747
8da9ebf73026 Added bytes and b'' as aliases for str and ''
Christian Heimes <christian@cheimes.de>
parents: 44572
diff changeset
3461 if (quote == 'b' || quote == 'B') {
8da9ebf73026 Added bytes and b'' as aliases for str and ''
Christian Heimes <christian@cheimes.de>
parents: 44572
diff changeset
3462 quote = *++s;
46118
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
3463 unicode = 0;
44747
8da9ebf73026 Added bytes and b'' as aliases for str and ''
Christian Heimes <christian@cheimes.de>
parents: 44572
diff changeset
3464 }
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3465 if (quote == 'r' || quote == 'R') {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3466 quote = *++s;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3467 rawmode = 1;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3468 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3469 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3470 if (quote != '\'' && quote != '\"') {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3471 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3472 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3473 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3474 s++;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3475 len = strlen(s);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3476 if (len > INT_MAX) {
61272
77b78607600e Remove two unneeded branches to an 'if' statement by applying De Morgan's Law
Brett Cannon <bcannon@gmail.com>
parents: 61268
diff changeset
3477 PyErr_SetString(PyExc_OverflowError,
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3478 "string to parse is too long");
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3479 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3480 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3481 if (s[--len] != quote) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3482 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3483 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3484 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3485 if (len >= 4 && s[0] == quote && s[1] == quote) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3486 s += 2;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3487 len -= 2;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3488 if (s[--len] != quote || s[--len] != quote) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3489 PyErr_BadInternalCall();
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3490 return NULL;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3491 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3492 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3493 #ifdef Py_USING_UNICODE
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3494 if (unicode || Py_UnicodeFlag) {
46642
0deb4ab0426e The compiling struct is now passed around to all AST helpers (see issue 2720)
Benjamin Peterson <benjamin@python.org>
parents: 46200
diff changeset
3495 return decode_unicode(c, s, len, rawmode, c->c_encoding);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3496 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3497 #endif
46118
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
3498 need_encoding = (c->c_encoding != NULL &&
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
3499 strcmp(c->c_encoding, "utf-8") != 0 &&
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
3500 strcmp(c->c_encoding, "iso-8859-1") != 0);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3501 if (rawmode || strchr(s, '\\') == NULL) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3502 if (need_encoding) {
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3503 #ifndef Py_USING_UNICODE
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3504 /* This should not happen - we never see any other
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3505 encoding. */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3506 Py_FatalError(
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3507 "cannot deal with encodings in this build.");
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3508 #else
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3509 PyObject *v, *u = PyUnicode_DecodeUTF8(s, len, NULL);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3510 if (u == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3511 return NULL;
46118
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
3512 v = PyUnicode_AsEncodedString(u, c->c_encoding, NULL);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3513 Py_DECREF(u);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3514 return v;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3515 #endif
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3516 } else {
47527
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
3517 return PyString_FromStringAndSize(s, len);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3518 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3519 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3520
47527
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
3521 return PyString_DecodeEscape(s, len, NULL, unicode,
46118
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
3522 need_encoding ? c->c_encoding : NULL);
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3523 }
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3524
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3525 /* Build a Python string object out of a STRING atom. This takes care of
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3526 * compile-time literal catenation, calling parsestr() on each piece, and
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3527 * pasting the intermediate results together.
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3528 */
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3529 static PyObject *
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3530 parsestrplus(struct compiling *c, const node *n)
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3531 {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3532 PyObject *v;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3533 int i;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3534 REQ(CHILD(n, 0), STRING);
46118
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
3535 if ((v = parsestr(c, STR(CHILD(n, 0)))) != NULL) {
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3536 /* String literal concatenation */
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3537 for (i = 1; i < NCH(n); i++) {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3538 PyObject *s;
46118
c78d3586c474 Patch #2477: Added from __future__ import unicode_literals
Christian Heimes <christian@cheimes.de>
parents: 46075
diff changeset
3539 s = parsestr(c, STR(CHILD(n, i)));
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3540 if (s == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3541 goto onError;
47527
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
3542 if (PyString_Check(v) && PyString_Check(s)) {
52294af4b663 This reverts r63675 based on the discussion in this thread:
Gregory P. Smith <greg@mad-scientist.com>
parents: 47524
diff changeset
3543 PyString_ConcatAndDel(&v, s);
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3544 if (v == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3545 goto onError;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3546 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3547 #ifdef Py_USING_UNICODE
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3548 else {
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3549 PyObject *temp = PyUnicode_Concat(v, s);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3550 Py_DECREF(s);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3551 Py_DECREF(v);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3552 v = temp;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3553 if (v == NULL)
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3554 goto onError;
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3555 }
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3556 #endif
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3557 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3558 }
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3559 return v;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3560
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3561 onError:
41215
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3562 Py_XDECREF(v);
72da48d96257 Clean up formatting of this file.
Jeremy Hylton <jeremy@alum.mit.edu>
parents: 41205
diff changeset
3563 return NULL;
35742
1c4d192f1568 Merge ast-branch to head
Jeremy Hylton <jeremy@alum.mit.edu>
parents:
diff changeset
3564 }