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

annotate Python/Python-ast.c @ 78855:5a2ef447b80d 2.7

Issue #13992: The trashcan mechanism is now thread-safe. This eliminates sporadic crashes in multi-thread programs when several long deallocator chains ran concurrently and involved subclasses of built-in container types. Because of this change, a couple extension modules compiled for 2.7.4 (those which use the trashcan mechanism, despite it being undocumented) will not be loadable by 2.7.3 and earlier. However, extension modules compiled for 2.7.3 and earlier will be loadable by 2.7.4.

author	Antoine Pitrou <solipsis@pitrou.net>
date	Thu, 06 Sep 2012 00:59:49 +0200
parents	7a72068d88fe
children	a9341ce35abc

rev	line source
40824 180d4e899683 Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c Brett Cannon <bcannon@gmail.com> parents: 40817 diff changeset	1 /* File automatically generated by Parser/asdl_c.py. */
180d4e899683 Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c Brett Cannon <bcannon@gmail.com> parents: 40817 diff changeset	2
180d4e899683 Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c Brett Cannon <bcannon@gmail.com> parents: 40817 diff changeset	3
180d4e899683 Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c Brett Cannon <bcannon@gmail.com> parents: 40817 diff changeset	4 /*
71463 7a72068d88fe allow None identifiers Benjamin Peterson <benjamin@python.org> parents: 71452 diff changeset	5 __version__ 82160.
40824 180d4e899683 Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c Brett Cannon <bcannon@gmail.com> parents: 40817 diff changeset	6
180d4e899683 Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c Brett Cannon <bcannon@gmail.com> parents: 40817 diff changeset	7 This module must be committed separately after each AST grammar change;
180d4e899683 Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c Brett Cannon <bcannon@gmail.com> parents: 40817 diff changeset	8 The __version__ number is set to the revision number of the commit
180d4e899683 Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c Brett Cannon <bcannon@gmail.com> parents: 40817 diff changeset	9 containing the grammar change.
180d4e899683 Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c Brett Cannon <bcannon@gmail.com> parents: 40817 diff changeset	10 */
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	11
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	12 #include "Python.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	13 #include "Python-ast.h"
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	14
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	15 static PyTypeObject AST_type;
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	16 static PyTypeObject *mod_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	17 static PyObject* ast2obj_mod(void*);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	18 static PyTypeObject *Module_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	19 static char *Module_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	20 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	21 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	22 static PyTypeObject *Interactive_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	23 static char *Interactive_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	24 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	25 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	26 static PyTypeObject *Expression_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	27 static char *Expression_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	28 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	29 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	30 static PyTypeObject *Suite_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	31 static char *Suite_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	32 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	33 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	34 static PyTypeObject *stmt_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	35 static char *stmt_attributes[] = {
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	36 "lineno",
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	37 "col_offset",
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	38 };
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	39 static PyObject* ast2obj_stmt(void*);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	40 static PyTypeObject *FunctionDef_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	41 static char *FunctionDef_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	42 "name",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	43 "args",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	44 "body",
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	45 "decorator_list",
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	46 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	47 static PyTypeObject *ClassDef_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	48 static char *ClassDef_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	49 "name",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	50 "bases",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	51 "body",
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	52 "decorator_list",
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	53 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	54 static PyTypeObject *Return_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	55 static char *Return_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	56 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	57 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	58 static PyTypeObject *Delete_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	59 static char *Delete_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	60 "targets",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	61 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	62 static PyTypeObject *Assign_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	63 static char *Assign_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	64 "targets",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	65 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	66 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	67 static PyTypeObject *AugAssign_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	68 static char *AugAssign_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	69 "target",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	70 "op",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	71 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	72 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	73 static PyTypeObject *Print_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	74 static char *Print_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	75 "dest",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	76 "values",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	77 "nl",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	78 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	79 static PyTypeObject *For_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	80 static char *For_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	81 "target",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	82 "iter",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	83 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	84 "orelse",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	85 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	86 static PyTypeObject *While_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	87 static char *While_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	88 "test",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	89 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	90 "orelse",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	91 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	92 static PyTypeObject *If_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	93 static char *If_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	94 "test",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	95 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	96 "orelse",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	97 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	98 static PyTypeObject *With_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	99 static char *With_fields[]={
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	100 "context_expr",
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	101 "optional_vars",
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	102 "body",
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	103 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	104 static PyTypeObject *Raise_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	105 static char *Raise_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	106 "type",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	107 "inst",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	108 "tback",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	109 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	110 static PyTypeObject *TryExcept_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	111 static char *TryExcept_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	112 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	113 "handlers",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	114 "orelse",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	115 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	116 static PyTypeObject *TryFinally_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	117 static char *TryFinally_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	118 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	119 "finalbody",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	120 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	121 static PyTypeObject *Assert_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	122 static char *Assert_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	123 "test",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	124 "msg",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	125 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	126 static PyTypeObject *Import_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	127 static char *Import_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	128 "names",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	129 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	130 static PyTypeObject *ImportFrom_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	131 static char *ImportFrom_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	132 "module",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	133 "names",
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	134 "level",
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	135 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	136 static PyTypeObject *Exec_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	137 static char *Exec_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	138 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	139 "globals",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	140 "locals",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	141 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	142 static PyTypeObject *Global_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	143 static char *Global_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	144 "names",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	145 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	146 static PyTypeObject *Expr_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	147 static char *Expr_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	148 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	149 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	150 static PyTypeObject *Pass_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	151 static PyTypeObject *Break_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	152 static PyTypeObject *Continue_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	153 static PyTypeObject *expr_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	154 static char *expr_attributes[] = {
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	155 "lineno",
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	156 "col_offset",
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	157 };
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	158 static PyObject* ast2obj_expr(void*);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	159 static PyTypeObject *BoolOp_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	160 static char *BoolOp_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	161 "op",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	162 "values",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	163 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	164 static PyTypeObject *BinOp_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	165 static char *BinOp_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	166 "left",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	167 "op",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	168 "right",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	169 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	170 static PyTypeObject *UnaryOp_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	171 static char *UnaryOp_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	172 "op",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	173 "operand",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	174 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	175 static PyTypeObject *Lambda_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	176 static char *Lambda_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	177 "args",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	178 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	179 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	180 static PyTypeObject *IfExp_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	181 static char *IfExp_fields[]={
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	182 "test",
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	183 "body",
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	184 "orelse",
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	185 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	186 static PyTypeObject *Dict_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	187 static char *Dict_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	188 "keys",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	189 "values",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	190 };
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	191 static PyTypeObject *Set_type;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	192 static char *Set_fields[]={
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	193 "elts",
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	194 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	195 static PyTypeObject *ListComp_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	196 static char *ListComp_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	197 "elt",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	198 "generators",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	199 };
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	200 static PyTypeObject *SetComp_type;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	201 static char *SetComp_fields[]={
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	202 "elt",
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	203 "generators",
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	204 };
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	205 static PyTypeObject *DictComp_type;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	206 static char *DictComp_fields[]={
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	207 "key",
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	208 "value",
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	209 "generators",
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	210 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	211 static PyTypeObject *GeneratorExp_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	212 static char *GeneratorExp_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	213 "elt",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	214 "generators",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	215 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	216 static PyTypeObject *Yield_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	217 static char *Yield_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	218 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	219 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	220 static PyTypeObject *Compare_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	221 static char *Compare_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	222 "left",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	223 "ops",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	224 "comparators",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	225 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	226 static PyTypeObject *Call_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	227 static char *Call_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	228 "func",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	229 "args",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	230 "keywords",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	231 "starargs",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	232 "kwargs",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	233 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	234 static PyTypeObject *Repr_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	235 static char *Repr_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	236 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	237 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	238 static PyTypeObject *Num_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	239 static char *Num_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	240 "n",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	241 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	242 static PyTypeObject *Str_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	243 static char *Str_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	244 "s",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	245 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	246 static PyTypeObject *Attribute_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	247 static char *Attribute_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	248 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	249 "attr",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	250 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	251 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	252 static PyTypeObject *Subscript_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	253 static char *Subscript_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	254 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	255 "slice",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	256 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	257 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	258 static PyTypeObject *Name_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	259 static char *Name_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	260 "id",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	261 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	262 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	263 static PyTypeObject *List_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	264 static char *List_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	265 "elts",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	266 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	267 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	268 static PyTypeObject *Tuple_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	269 static char *Tuple_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	270 "elts",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	271 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	272 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	273 static PyTypeObject *expr_context_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	274 static PyObject Load_singleton, Store_singleton, *Del_singleton,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	275 AugLoad_singleton, AugStore_singleton, *Param_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	276 static PyObject* ast2obj_expr_context(expr_context_ty);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	277 static PyTypeObject *Load_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	278 static PyTypeObject *Store_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	279 static PyTypeObject *Del_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	280 static PyTypeObject *AugLoad_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	281 static PyTypeObject *AugStore_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	282 static PyTypeObject *Param_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	283 static PyTypeObject *slice_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	284 static PyObject* ast2obj_slice(void*);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	285 static PyTypeObject *Ellipsis_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	286 static PyTypeObject *Slice_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	287 static char *Slice_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	288 "lower",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	289 "upper",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	290 "step",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	291 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	292 static PyTypeObject *ExtSlice_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	293 static char *ExtSlice_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	294 "dims",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	295 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	296 static PyTypeObject *Index_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	297 static char *Index_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	298 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	299 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	300 static PyTypeObject *boolop_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	301 static PyObject And_singleton, Or_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	302 static PyObject* ast2obj_boolop(boolop_ty);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	303 static PyTypeObject *And_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	304 static PyTypeObject *Or_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	305 static PyTypeObject *operator_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	306 static PyObject Add_singleton, Sub_singleton, *Mult_singleton,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	307 Div_singleton, Mod_singleton, Pow_singleton, LShift_singleton,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	308 RShift_singleton, BitOr_singleton, BitXor_singleton, BitAnd_singleton,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	309 *FloorDiv_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	310 static PyObject* ast2obj_operator(operator_ty);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	311 static PyTypeObject *Add_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	312 static PyTypeObject *Sub_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	313 static PyTypeObject *Mult_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	314 static PyTypeObject *Div_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	315 static PyTypeObject *Mod_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	316 static PyTypeObject *Pow_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	317 static PyTypeObject *LShift_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	318 static PyTypeObject *RShift_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	319 static PyTypeObject *BitOr_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	320 static PyTypeObject *BitXor_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	321 static PyTypeObject *BitAnd_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	322 static PyTypeObject *FloorDiv_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	323 static PyTypeObject *unaryop_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	324 static PyObject Invert_singleton, Not_singleton, *UAdd_singleton,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	325 *USub_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	326 static PyObject* ast2obj_unaryop(unaryop_ty);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	327 static PyTypeObject *Invert_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	328 static PyTypeObject *Not_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	329 static PyTypeObject *UAdd_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	330 static PyTypeObject *USub_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	331 static PyTypeObject *cmpop_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	332 static PyObject Eq_singleton, NotEq_singleton, Lt_singleton, LtE_singleton,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	333 Gt_singleton, GtE_singleton, Is_singleton, IsNot_singleton, *In_singleton,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	334 *NotIn_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	335 static PyObject* ast2obj_cmpop(cmpop_ty);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	336 static PyTypeObject *Eq_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	337 static PyTypeObject *NotEq_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	338 static PyTypeObject *Lt_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	339 static PyTypeObject *LtE_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	340 static PyTypeObject *Gt_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	341 static PyTypeObject *GtE_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	342 static PyTypeObject *Is_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	343 static PyTypeObject *IsNot_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	344 static PyTypeObject *In_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	345 static PyTypeObject *NotIn_type;
dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	346 static PyTypeObject *comprehension_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	347 static PyObject* ast2obj_comprehension(void*);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	348 static char *comprehension_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	349 "target",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	350 "iter",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	351 "ifs",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	352 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	353 static PyTypeObject *excepthandler_type;
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	354 static char *excepthandler_attributes[] = {
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	355 "lineno",
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	356 "col_offset",
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	357 };
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	358 static PyObject* ast2obj_excepthandler(void*);
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	359 static PyTypeObject *ExceptHandler_type;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	360 static char *ExceptHandler_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	361 "type",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	362 "name",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	363 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	364 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	365 static PyTypeObject *arguments_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	366 static PyObject* ast2obj_arguments(void*);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	367 static char *arguments_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	368 "args",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	369 "vararg",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	370 "kwarg",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	371 "defaults",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	372 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	373 static PyTypeObject *keyword_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	374 static PyObject* ast2obj_keyword(void*);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	375 static char *keyword_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	376 "arg",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	377 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	378 };
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	379 static PyTypeObject *alias_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	380 static PyObject* ast2obj_alias(void*);
36743 dbf9cc6c36eb Don't pollute namespace as bad as before. All the types are static now. Neal Norwitz <nnorwitz@gmail.com> parents: 36726 diff changeset	381 static char *alias_fields[]={
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	382 "name",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	383 "asname",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	384 };
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	385
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	386
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	387 static int
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	388 ast_type_init(PyObject self, PyObject args, PyObject *kw)
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	389 {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	390 Py_ssize_t i, numfields = 0;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	391 int res = -1;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	392 PyObject key, value, *fields;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	393 fields = PyObject_GetAttrString((PyObject*)Py_TYPE(self), "_fields");
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	394 if (!fields)
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	395 PyErr_Clear();
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	396 if (fields) {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	397 numfields = PySequence_Size(fields);
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	398 if (numfields == -1)
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	399 goto cleanup;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	400 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	401 res = 0; /* if no error occurs, this stays 0 to the end */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	402 if (PyTuple_GET_SIZE(args) > 0) {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	403 if (numfields != PyTuple_GET_SIZE(args)) {
46207 59d42e6d1885 Fix error message -- "expects either 0 or 0 arguments" Georg Brandl <georg@python.org> parents: 46204 diff changeset	404 PyErr_Format(PyExc_TypeError, "%.400s constructor takes %s"
49138 145449109a31 #3743: PY_FORMAT_SIZE_T is designed for the OS "printf" functions, not for Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	405 "%zd positional argument%s",
46207 59d42e6d1885 Fix error message -- "expects either 0 or 0 arguments" Georg Brandl <georg@python.org> parents: 46204 diff changeset	406 Py_TYPE(self)->tp_name,
59d42e6d1885 Fix error message -- "expects either 0 or 0 arguments" Georg Brandl <georg@python.org> parents: 46204 diff changeset	407 numfields == 0 ? "" : "either 0 or ",
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	408 numfields, numfields == 1 ? "" : "s");
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	409 res = -1;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	410 goto cleanup;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	411 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	412 for (i = 0; i < PyTuple_GET_SIZE(args); i++) {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	413 /* cannot be reached when fields is NULL */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	414 PyObject *name = PySequence_GetItem(fields, i);
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	415 if (!name) {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	416 res = -1;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	417 goto cleanup;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	418 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	419 res = PyObject_SetAttr(self, name, PyTuple_GET_ITEM(args, i));
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	420 Py_DECREF(name);
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	421 if (res < 0)
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	422 goto cleanup;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	423 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	424 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	425 if (kw) {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	426 i = 0; /* needed by PyDict_Next */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	427 while (PyDict_Next(kw, &i, &key, &value)) {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	428 res = PyObject_SetAttr(self, key, value);
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	429 if (res < 0)
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	430 goto cleanup;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	431 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	432 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	433 cleanup:
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	434 Py_XDECREF(fields);
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	435 return res;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	436 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	437
46212 be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	438 /* Pickling support */
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	439 static PyObject *
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	440 ast_type_reduce(PyObject self, PyObject unused)
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	441 {
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	442 PyObject *res;
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	443 PyObject *dict = PyObject_GetAttrString(self, "__dict__");
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	444 if (dict == NULL) {
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	445 if (PyErr_ExceptionMatches(PyExc_AttributeError))
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	446 PyErr_Clear();
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	447 else
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	448 return NULL;
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	449 }
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	450 if (dict) {
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	451 res = Py_BuildValue("O()O", Py_TYPE(self), dict);
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	452 Py_DECREF(dict);
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	453 return res;
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	454 }
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	455 return Py_BuildValue("O()", Py_TYPE(self));
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	456 }
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	457
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	458 static PyMethodDef ast_type_methods[] = {
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	459 {"__reduce__", ast_type_reduce, METH_NOARGS, NULL},
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	460 {NULL}
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	461 };
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	462
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	463 static PyTypeObject AST_type = {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	464 PyVarObject_HEAD_INIT(&PyType_Type, 0)
46212 be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	465 "_ast.AST",
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	466 sizeof(PyObject),
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	467 0,
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	468 0, /* tp_dealloc */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	469 0, /* tp_print */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	470 0, /* tp_getattr */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	471 0, /* tp_setattr */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	472 0, /* tp_compare */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	473 0, /* tp_repr */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	474 0, /* tp_as_number */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	475 0, /* tp_as_sequence */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	476 0, /* tp_as_mapping */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	477 0, /* tp_hash */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	478 0, /* tp_call */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	479 0, /* tp_str */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	480 PyObject_GenericGetAttr, /* tp_getattro */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	481 PyObject_GenericSetAttr, /* tp_setattro */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	482 0, /* tp_as_buffer */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	483 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	484 0, /* tp_doc */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	485 0, /* tp_traverse */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	486 0, /* tp_clear */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	487 0, /* tp_richcompare */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	488 0, /* tp_weaklistoffset */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	489 0, /* tp_iter */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	490 0, /* tp_iternext */
46212 be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	491 ast_type_methods, /* tp_methods */
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	492 0, /* tp_members */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	493 0, /* tp_getset */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	494 0, /* tp_base */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	495 0, /* tp_dict */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	496 0, /* tp_descr_get */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	497 0, /* tp_descr_set */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	498 0, /* tp_dictoffset */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	499 (initproc)ast_type_init, /* tp_init */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	500 PyType_GenericAlloc, /* tp_alloc */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	501 PyType_GenericNew, /* tp_new */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	502 PyObject_Del, /* tp_free */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	503 };
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	504
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	505
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	506 static PyTypeObject* make_type(char type, PyTypeObject base, char**fields, int num_fields)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	507 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	508 PyObject fnames, result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	509 int i;
46204 29ea507fd998 Make _fields attr for no fields consistent with _attributes attr. Georg Brandl <georg@python.org> parents: 46202 diff changeset	510 fnames = PyTuple_New(num_fields);
29ea507fd998 Make _fields attr for no fields consistent with _attributes attr. Georg Brandl <georg@python.org> parents: 46202 diff changeset	511 if (!fnames) return NULL;
29ea507fd998 Make _fields attr for no fields consistent with _attributes attr. Georg Brandl <georg@python.org> parents: 46202 diff changeset	512 for (i = 0; i < num_fields; i++) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	513 PyObject *field = PyString_FromString(fields[i]);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	514 if (!field) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	515 Py_DECREF(fnames);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	516 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	517 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	518 PyTuple_SET_ITEM(fnames, i, field);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	519 }
36726 bbf16fd024df from __future__ import with_statement addon for 'with', mostly written by Thomas Wouters <thomas@python.org> parents: 36712 diff changeset	520 result = PyObject_CallFunction((PyObject*)&PyType_Type, "s(O){sOss}",
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	521 type, base, "_fields", fnames, "__module__", "_ast");
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	522 Py_DECREF(fnames);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	523 return (PyTypeObject*)result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	524 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	525
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	526 static int add_attributes(PyTypeObject* type, char**attrs, int num_fields)
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	527 {
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	528 int i, result;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	529 PyObject s, l = PyTuple_New(num_fields);
62216 5bf7336ea0aa fix code formatting Benjamin Peterson <benjamin@python.org> parents: 58251 diff changeset	530 if (!l)
5bf7336ea0aa fix code formatting Benjamin Peterson <benjamin@python.org> parents: 58251 diff changeset	531 return 0;
5bf7336ea0aa fix code formatting Benjamin Peterson <benjamin@python.org> parents: 58251 diff changeset	532 for (i = 0; i < num_fields; i++) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	533 s = PyString_FromString(attrs[i]);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	534 if (!s) {
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	535 Py_DECREF(l);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	536 return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	537 }
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	538 PyTuple_SET_ITEM(l, i, s);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	539 }
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	540 result = PyObject_SetAttrString((PyObject*)type, "_attributes", l) >= 0;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	541 Py_DECREF(l);
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	542 return result;
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	543 }
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	544
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	545 /* Conversion AST -> Python */
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	546
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	547 static PyObject* ast2obj_list(asdl_seq seq, PyObject (func)(void))
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	548 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	549 int i, n = asdl_seq_LEN(seq);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	550 PyObject *result = PyList_New(n);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	551 PyObject *value;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	552 if (!result)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	553 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	554 for (i = 0; i < n; i++) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	555 value = func(asdl_seq_GET(seq, i));
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	556 if (!value) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	557 Py_DECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	558 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	559 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	560 PyList_SET_ITEM(result, i, value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	561 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	562 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	563 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	564
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	565 static PyObject* ast2obj_object(void *o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	566 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	567 if (!o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	568 o = Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	569 Py_INCREF((PyObject*)o);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	570 return (PyObject*)o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	571 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	572 #define ast2obj_identifier ast2obj_object
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	573 #define ast2obj_string ast2obj_object
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	574 static PyObject* ast2obj_bool(bool b)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	575 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	576 return PyBool_FromLong(b);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	577 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	578
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	579 static PyObject* ast2obj_int(long b)
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	580 {
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	581 return PyInt_FromLong(b);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	582 }
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	583
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	584 /* Conversion Python -> AST */
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	585
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	586 static int obj2ast_object(PyObject* obj, PyObject** out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	587 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	588 if (obj == Py_None)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	589 obj = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	590 if (obj)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	591 PyArena_AddPyObject(arena, obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	592 Py_XINCREF(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	593 *out = obj;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	594 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	595 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	596
71452 a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	597 static int obj2ast_identifier(PyObject* obj, PyObject** out, PyArena* arena)
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	598 {
71463 7a72068d88fe allow None identifiers Benjamin Peterson <benjamin@python.org> parents: 71452 diff changeset	599 if (!PyString_CheckExact(obj) && obj != Py_None) {
71452 a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	600 PyErr_Format(PyExc_TypeError,
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	601 "AST identifier must be of type str");
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	602 return 1;
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	603 }
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	604 return obj2ast_object(obj, out, arena);
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	605 }
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	606
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	607 static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	608 {
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	609 if (!PyString_CheckExact(obj) && !PyUnicode_CheckExact(obj)) {
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	610 PyErr_SetString(PyExc_TypeError,
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	611 "AST string must be of type str or unicode");
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	612 return 1;
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	613 }
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	614 return obj2ast_object(obj, out, arena);
a21829180423 verify the types of AST strings and identifiers (closes #12609 and #12610) Benjamin Peterson <benjamin@python.org> parents: 70304 diff changeset	615 }
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	616
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	617 static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	618 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	619 int i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	620 if (!PyInt_Check(obj) && !PyLong_Check(obj)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	621 PyObject *s = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	622 if (s == NULL) return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	623 PyErr_Format(PyExc_ValueError, "invalid integer value: %.400s",
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	624 PyString_AS_STRING(s));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	625 Py_DECREF(s);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	626 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	627 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	628
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	629 i = (int)PyLong_AsLong(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	630 if (i == -1 && PyErr_Occurred())
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	631 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	632 *out = i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	633 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	634 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	635
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	636 static int obj2ast_bool(PyObject* obj, bool* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	637 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	638 if (!PyBool_Check(obj)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	639 PyObject *s = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	640 if (s == NULL) return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	641 PyErr_Format(PyExc_ValueError, "invalid boolean value: %.400s",
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	642 PyString_AS_STRING(s));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	643 Py_DECREF(s);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	644 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	645 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	646
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	647 *out = (obj == Py_True);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	648 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	649 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	650
49677 82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	651 static int add_ast_fields(void)
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	652 {
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	653 PyObject empty_tuple, d;
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	654 if (PyType_Ready(&AST_type) < 0)
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	655 return -1;
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	656 d = AST_type.tp_dict;
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	657 empty_tuple = PyTuple_New(0);
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	658 if (!empty_tuple \|\|
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	659 PyDict_SetItemString(d, "_fields", empty_tuple) < 0 \|\|
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	660 PyDict_SetItemString(d, "_attributes", empty_tuple) < 0) {
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	661 Py_XDECREF(empty_tuple);
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	662 return -1;
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	663 }
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	664 Py_DECREF(empty_tuple);
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	665 return 0;
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	666 }
82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	667
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	668
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	669 static int init_types(void)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	670 {
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	671 static int initialized;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	672 if (initialized) return 1;
49677 82ccc7e77ec5 Merged revisions 66801,66803-66804,66813,66854-66856,66866,66870-66872,66874,66887,66903,66905,66911,66913,66927,66932,66938,66942,66962,66964,66973-66974,66977,66992,66998-66999,67002,67005,67007,67028,67040-67041,67044,67070,67089,67091,67101,67117-67119,67123-67124 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	673 if (add_ast_fields() < 0) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	674 mod_type = make_type("mod", &AST_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	675 if (!mod_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	676 if (!add_attributes(mod_type, NULL, 0)) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	677 Module_type = make_type("Module", mod_type, Module_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	678 if (!Module_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	679 Interactive_type = make_type("Interactive", mod_type,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	680 Interactive_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	681 if (!Interactive_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	682 Expression_type = make_type("Expression", mod_type, Expression_fields,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	683 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	684 if (!Expression_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	685 Suite_type = make_type("Suite", mod_type, Suite_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	686 if (!Suite_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	687 stmt_type = make_type("stmt", &AST_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	688 if (!stmt_type) return 0;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	689 if (!add_attributes(stmt_type, stmt_attributes, 2)) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	690 FunctionDef_type = make_type("FunctionDef", stmt_type,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	691 FunctionDef_fields, 4);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	692 if (!FunctionDef_type) return 0;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	693 ClassDef_type = make_type("ClassDef", stmt_type, ClassDef_fields, 4);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	694 if (!ClassDef_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	695 Return_type = make_type("Return", stmt_type, Return_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	696 if (!Return_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	697 Delete_type = make_type("Delete", stmt_type, Delete_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	698 if (!Delete_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	699 Assign_type = make_type("Assign", stmt_type, Assign_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	700 if (!Assign_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	701 AugAssign_type = make_type("AugAssign", stmt_type, AugAssign_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	702 if (!AugAssign_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	703 Print_type = make_type("Print", stmt_type, Print_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	704 if (!Print_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	705 For_type = make_type("For", stmt_type, For_fields, 4);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	706 if (!For_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	707 While_type = make_type("While", stmt_type, While_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	708 if (!While_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	709 If_type = make_type("If", stmt_type, If_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	710 if (!If_type) return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	711 With_type = make_type("With", stmt_type, With_fields, 3);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	712 if (!With_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	713 Raise_type = make_type("Raise", stmt_type, Raise_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	714 if (!Raise_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	715 TryExcept_type = make_type("TryExcept", stmt_type, TryExcept_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	716 if (!TryExcept_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	717 TryFinally_type = make_type("TryFinally", stmt_type, TryFinally_fields,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	718 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	719 if (!TryFinally_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	720 Assert_type = make_type("Assert", stmt_type, Assert_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	721 if (!Assert_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	722 Import_type = make_type("Import", stmt_type, Import_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	723 if (!Import_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	724 ImportFrom_type = make_type("ImportFrom", stmt_type, ImportFrom_fields,
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	725 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	726 if (!ImportFrom_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	727 Exec_type = make_type("Exec", stmt_type, Exec_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	728 if (!Exec_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	729 Global_type = make_type("Global", stmt_type, Global_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	730 if (!Global_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	731 Expr_type = make_type("Expr", stmt_type, Expr_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	732 if (!Expr_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	733 Pass_type = make_type("Pass", stmt_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	734 if (!Pass_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	735 Break_type = make_type("Break", stmt_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	736 if (!Break_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	737 Continue_type = make_type("Continue", stmt_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	738 if (!Continue_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	739 expr_type = make_type("expr", &AST_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	740 if (!expr_type) return 0;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	741 if (!add_attributes(expr_type, expr_attributes, 2)) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	742 BoolOp_type = make_type("BoolOp", expr_type, BoolOp_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	743 if (!BoolOp_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	744 BinOp_type = make_type("BinOp", expr_type, BinOp_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	745 if (!BinOp_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	746 UnaryOp_type = make_type("UnaryOp", expr_type, UnaryOp_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	747 if (!UnaryOp_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	748 Lambda_type = make_type("Lambda", expr_type, Lambda_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	749 if (!Lambda_type) return 0;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	750 IfExp_type = make_type("IfExp", expr_type, IfExp_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	751 if (!IfExp_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	752 Dict_type = make_type("Dict", expr_type, Dict_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	753 if (!Dict_type) return 0;
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	754 Set_type = make_type("Set", expr_type, Set_fields, 1);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	755 if (!Set_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	756 ListComp_type = make_type("ListComp", expr_type, ListComp_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	757 if (!ListComp_type) return 0;
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	758 SetComp_type = make_type("SetComp", expr_type, SetComp_fields, 2);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	759 if (!SetComp_type) return 0;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	760 DictComp_type = make_type("DictComp", expr_type, DictComp_fields, 3);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	761 if (!DictComp_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	762 GeneratorExp_type = make_type("GeneratorExp", expr_type,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	763 GeneratorExp_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	764 if (!GeneratorExp_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	765 Yield_type = make_type("Yield", expr_type, Yield_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	766 if (!Yield_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	767 Compare_type = make_type("Compare", expr_type, Compare_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	768 if (!Compare_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	769 Call_type = make_type("Call", expr_type, Call_fields, 5);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	770 if (!Call_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	771 Repr_type = make_type("Repr", expr_type, Repr_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	772 if (!Repr_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	773 Num_type = make_type("Num", expr_type, Num_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	774 if (!Num_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	775 Str_type = make_type("Str", expr_type, Str_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	776 if (!Str_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	777 Attribute_type = make_type("Attribute", expr_type, Attribute_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	778 if (!Attribute_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	779 Subscript_type = make_type("Subscript", expr_type, Subscript_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	780 if (!Subscript_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	781 Name_type = make_type("Name", expr_type, Name_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	782 if (!Name_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	783 List_type = make_type("List", expr_type, List_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	784 if (!List_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	785 Tuple_type = make_type("Tuple", expr_type, Tuple_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	786 if (!Tuple_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	787 expr_context_type = make_type("expr_context", &AST_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	788 if (!expr_context_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	789 if (!add_attributes(expr_context_type, NULL, 0)) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	790 Load_type = make_type("Load", expr_context_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	791 if (!Load_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	792 Load_singleton = PyType_GenericNew(Load_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	793 if (!Load_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	794 Store_type = make_type("Store", expr_context_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	795 if (!Store_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	796 Store_singleton = PyType_GenericNew(Store_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	797 if (!Store_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	798 Del_type = make_type("Del", expr_context_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	799 if (!Del_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	800 Del_singleton = PyType_GenericNew(Del_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	801 if (!Del_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	802 AugLoad_type = make_type("AugLoad", expr_context_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	803 if (!AugLoad_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	804 AugLoad_singleton = PyType_GenericNew(AugLoad_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	805 if (!AugLoad_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	806 AugStore_type = make_type("AugStore", expr_context_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	807 if (!AugStore_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	808 AugStore_singleton = PyType_GenericNew(AugStore_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	809 if (!AugStore_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	810 Param_type = make_type("Param", expr_context_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	811 if (!Param_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	812 Param_singleton = PyType_GenericNew(Param_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	813 if (!Param_singleton) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	814 slice_type = make_type("slice", &AST_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	815 if (!slice_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	816 if (!add_attributes(slice_type, NULL, 0)) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	817 Ellipsis_type = make_type("Ellipsis", slice_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	818 if (!Ellipsis_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	819 Slice_type = make_type("Slice", slice_type, Slice_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	820 if (!Slice_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	821 ExtSlice_type = make_type("ExtSlice", slice_type, ExtSlice_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	822 if (!ExtSlice_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	823 Index_type = make_type("Index", slice_type, Index_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	824 if (!Index_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	825 boolop_type = make_type("boolop", &AST_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	826 if (!boolop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	827 if (!add_attributes(boolop_type, NULL, 0)) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	828 And_type = make_type("And", boolop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	829 if (!And_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	830 And_singleton = PyType_GenericNew(And_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	831 if (!And_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	832 Or_type = make_type("Or", boolop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	833 if (!Or_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	834 Or_singleton = PyType_GenericNew(Or_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	835 if (!Or_singleton) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	836 operator_type = make_type("operator", &AST_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	837 if (!operator_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	838 if (!add_attributes(operator_type, NULL, 0)) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	839 Add_type = make_type("Add", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	840 if (!Add_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	841 Add_singleton = PyType_GenericNew(Add_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	842 if (!Add_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	843 Sub_type = make_type("Sub", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	844 if (!Sub_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	845 Sub_singleton = PyType_GenericNew(Sub_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	846 if (!Sub_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	847 Mult_type = make_type("Mult", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	848 if (!Mult_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	849 Mult_singleton = PyType_GenericNew(Mult_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	850 if (!Mult_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	851 Div_type = make_type("Div", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	852 if (!Div_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	853 Div_singleton = PyType_GenericNew(Div_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	854 if (!Div_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	855 Mod_type = make_type("Mod", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	856 if (!Mod_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	857 Mod_singleton = PyType_GenericNew(Mod_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	858 if (!Mod_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	859 Pow_type = make_type("Pow", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	860 if (!Pow_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	861 Pow_singleton = PyType_GenericNew(Pow_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	862 if (!Pow_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	863 LShift_type = make_type("LShift", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	864 if (!LShift_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	865 LShift_singleton = PyType_GenericNew(LShift_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	866 if (!LShift_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	867 RShift_type = make_type("RShift", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	868 if (!RShift_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	869 RShift_singleton = PyType_GenericNew(RShift_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	870 if (!RShift_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	871 BitOr_type = make_type("BitOr", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	872 if (!BitOr_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	873 BitOr_singleton = PyType_GenericNew(BitOr_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	874 if (!BitOr_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	875 BitXor_type = make_type("BitXor", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	876 if (!BitXor_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	877 BitXor_singleton = PyType_GenericNew(BitXor_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	878 if (!BitXor_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	879 BitAnd_type = make_type("BitAnd", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	880 if (!BitAnd_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	881 BitAnd_singleton = PyType_GenericNew(BitAnd_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	882 if (!BitAnd_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	883 FloorDiv_type = make_type("FloorDiv", operator_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	884 if (!FloorDiv_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	885 FloorDiv_singleton = PyType_GenericNew(FloorDiv_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	886 if (!FloorDiv_singleton) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	887 unaryop_type = make_type("unaryop", &AST_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	888 if (!unaryop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	889 if (!add_attributes(unaryop_type, NULL, 0)) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	890 Invert_type = make_type("Invert", unaryop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	891 if (!Invert_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	892 Invert_singleton = PyType_GenericNew(Invert_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	893 if (!Invert_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	894 Not_type = make_type("Not", unaryop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	895 if (!Not_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	896 Not_singleton = PyType_GenericNew(Not_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	897 if (!Not_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	898 UAdd_type = make_type("UAdd", unaryop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	899 if (!UAdd_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	900 UAdd_singleton = PyType_GenericNew(UAdd_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	901 if (!UAdd_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	902 USub_type = make_type("USub", unaryop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	903 if (!USub_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	904 USub_singleton = PyType_GenericNew(USub_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	905 if (!USub_singleton) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	906 cmpop_type = make_type("cmpop", &AST_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	907 if (!cmpop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	908 if (!add_attributes(cmpop_type, NULL, 0)) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	909 Eq_type = make_type("Eq", cmpop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	910 if (!Eq_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	911 Eq_singleton = PyType_GenericNew(Eq_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	912 if (!Eq_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	913 NotEq_type = make_type("NotEq", cmpop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	914 if (!NotEq_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	915 NotEq_singleton = PyType_GenericNew(NotEq_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	916 if (!NotEq_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	917 Lt_type = make_type("Lt", cmpop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	918 if (!Lt_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	919 Lt_singleton = PyType_GenericNew(Lt_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	920 if (!Lt_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	921 LtE_type = make_type("LtE", cmpop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	922 if (!LtE_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	923 LtE_singleton = PyType_GenericNew(LtE_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	924 if (!LtE_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	925 Gt_type = make_type("Gt", cmpop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	926 if (!Gt_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	927 Gt_singleton = PyType_GenericNew(Gt_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	928 if (!Gt_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	929 GtE_type = make_type("GtE", cmpop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	930 if (!GtE_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	931 GtE_singleton = PyType_GenericNew(GtE_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	932 if (!GtE_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	933 Is_type = make_type("Is", cmpop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	934 if (!Is_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	935 Is_singleton = PyType_GenericNew(Is_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	936 if (!Is_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	937 IsNot_type = make_type("IsNot", cmpop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	938 if (!IsNot_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	939 IsNot_singleton = PyType_GenericNew(IsNot_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	940 if (!IsNot_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	941 In_type = make_type("In", cmpop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	942 if (!In_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	943 In_singleton = PyType_GenericNew(In_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	944 if (!In_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	945 NotIn_type = make_type("NotIn", cmpop_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	946 if (!NotIn_type) return 0;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	947 NotIn_singleton = PyType_GenericNew(NotIn_type, NULL, NULL);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	948 if (!NotIn_singleton) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	949 comprehension_type = make_type("comprehension", &AST_type,
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	950 comprehension_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	951 if (!comprehension_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	952 excepthandler_type = make_type("excepthandler", &AST_type, NULL, 0);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	953 if (!excepthandler_type) return 0;
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	954 if (!add_attributes(excepthandler_type, excepthandler_attributes, 2))
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	955 return 0;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	956 ExceptHandler_type = make_type("ExceptHandler", excepthandler_type,
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	957 ExceptHandler_fields, 3);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	958 if (!ExceptHandler_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	959 arguments_type = make_type("arguments", &AST_type, arguments_fields, 4);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	960 if (!arguments_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	961 keyword_type = make_type("keyword", &AST_type, keyword_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	962 if (!keyword_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	963 alias_type = make_type("alias", &AST_type, alias_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	964 if (!alias_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	965 initialized = 1;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	966 return 1;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	967 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	968
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	969 static int obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	970 static int obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	971 static int obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	972 static int obj2ast_expr_context(PyObject* obj, expr_context_ty* out, PyArena*
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	973 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	974 static int obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	975 static int obj2ast_boolop(PyObject* obj, boolop_ty* out, PyArena* arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	976 static int obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	977 static int obj2ast_unaryop(PyObject* obj, unaryop_ty* out, PyArena* arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	978 static int obj2ast_cmpop(PyObject* obj, cmpop_ty* out, PyArena* arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	979 static int obj2ast_comprehension(PyObject* obj, comprehension_ty* out, PyArena*
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	980 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	981 static int obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena*
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	982 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	983 static int obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	984 static int obj2ast_keyword(PyObject* obj, keyword_ty* out, PyArena* arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	985 static int obj2ast_alias(PyObject* obj, alias_ty* out, PyArena* arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	986
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	987 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: 36003 diff changeset	988 Module(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	989 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	990 mod_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	991 p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	992 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	993 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	994 p->kind = Module_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	995 p->v.Module.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	996 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	997 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	998
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	999 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: 36003 diff changeset	1000 Interactive(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1001 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1002 mod_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1003 p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1004 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1005 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1006 p->kind = Interactive_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1007 p->v.Interactive.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1008 return p;
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 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: 36003 diff changeset	1012 Expression(expr_ty body, PyArena *arena)
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 mod_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1015 if (!body) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1016 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1017 "field body is required for Expression");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1018 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1019 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1020 p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1021 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1022 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1023 p->kind = Expression_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1024 p->v.Expression.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1025 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1026 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1027
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1028 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: 36003 diff changeset	1029 Suite(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1030 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1031 mod_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1032 p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1033 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1034 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1035 p->kind = Suite_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1036 p->v.Suite.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1037 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1038 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1039
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1040 stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1041 FunctionDef(identifier name, arguments_ty args, asdl_seq * body, asdl_seq *
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	1042 decorator_list, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1043 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1044 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1045 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1046 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1047 "field name is required for FunctionDef");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1048 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1049 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1050 if (!args) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1051 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1052 "field args is required for FunctionDef");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1053 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1054 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1055 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1056 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1057 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1058 p->kind = FunctionDef_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1059 p->v.FunctionDef.name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1060 p->v.FunctionDef.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1061 p->v.FunctionDef.body = body;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	1062 p->v.FunctionDef.decorator_list = decorator_list;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1063 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1064 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1065 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1066 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1067
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1068 stmt_ty
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	1069 ClassDef(identifier name, asdl_seq * bases, asdl_seq * body, asdl_seq *
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	1070 decorator_list, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1071 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1072 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1073 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1074 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1075 "field name is required for ClassDef");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1076 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1077 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1078 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1079 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1080 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1081 p->kind = ClassDef_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1082 p->v.ClassDef.name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1083 p->v.ClassDef.bases = bases;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1084 p->v.ClassDef.body = body;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	1085 p->v.ClassDef.decorator_list = decorator_list;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1086 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1087 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1088 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1089 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1090
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1091 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1092 Return(expr_ty value, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1093 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1094 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1095 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1096 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1097 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1098 p->kind = Return_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1099 p->v.Return.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1100 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1101 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1102 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1103 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1104
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1105 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1106 Delete(asdl_seq * targets, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1107 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1108 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1109 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1110 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1111 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1112 p->kind = Delete_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1113 p->v.Delete.targets = targets;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1114 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1115 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1116 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1117 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1118
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1119 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1120 Assign(asdl_seq * targets, expr_ty value, int lineno, int col_offset, PyArena
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1121 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1122 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1123 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1124 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1125 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1126 "field value is required for Assign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1127 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1128 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1129 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1130 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1131 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1132 p->kind = Assign_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1133 p->v.Assign.targets = targets;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1134 p->v.Assign.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1135 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1136 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1137 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1138 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1139
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1140 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1141 AugAssign(expr_ty target, operator_ty op, expr_ty value, int lineno, int
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1142 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1143 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1144 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1145 if (!target) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1146 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1147 "field target is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1148 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1149 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1150 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1151 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1152 "field op is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1153 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1154 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1155 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1156 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1157 "field value is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1158 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1159 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1160 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1161 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1162 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1163 p->kind = AugAssign_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1164 p->v.AugAssign.target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1165 p->v.AugAssign.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1166 p->v.AugAssign.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1167 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1168 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1169 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1170 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1171
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1172 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1173 Print(expr_ty dest, asdl_seq * values, bool nl, int lineno, int col_offset,
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1174 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1175 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1176 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1177 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1178 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1179 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1180 p->kind = Print_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1181 p->v.Print.dest = dest;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1182 p->v.Print.values = values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1183 p->v.Print.nl = nl;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1184 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1185 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1186 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1187 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1188
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1189 stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1190 For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * orelse, int
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1191 lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1192 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1193 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1194 if (!target) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1195 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1196 "field target is required for For");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1197 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1198 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1199 if (!iter) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1200 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1201 "field iter is required for For");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1202 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1203 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1204 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1205 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1206 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1207 p->kind = For_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1208 p->v.For.target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1209 p->v.For.iter = iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1210 p->v.For.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1211 p->v.For.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1212 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1213 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1214 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1215 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1216
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1217 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1218 While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, int
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1219 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1220 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1221 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1222 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1223 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1224 "field test is required for While");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1225 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1226 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1227 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1228 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1229 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1230 p->kind = While_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1231 p->v.While.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1232 p->v.While.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1233 p->v.While.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1234 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1235 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1236 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1237 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1238
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1239 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1240 If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, int
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1241 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1242 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1243 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1244 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1245 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1246 "field test is required for If");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1247 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1248 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1249 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1250 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1251 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1252 p->kind = If_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1253 p->v.If.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1254 p->v.If.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1255 p->v.If.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1256 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1257 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1258 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1259 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1260
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1261 stmt_ty
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1262 With(expr_ty context_expr, expr_ty optional_vars, asdl_seq * body, int lineno,
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1263 int col_offset, PyArena *arena)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1264 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1265 stmt_ty p;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1266 if (!context_expr) {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1267 PyErr_SetString(PyExc_ValueError,
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1268 "field context_expr is required for With");
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1269 return NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1270 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1271 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1272 if (!p)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1273 return NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1274 p->kind = With_kind;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1275 p->v.With.context_expr = context_expr;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1276 p->v.With.optional_vars = optional_vars;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1277 p->v.With.body = body;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1278 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1279 p->col_offset = col_offset;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1280 return p;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1281 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1282
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1283 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1284 Raise(expr_ty type, expr_ty inst, expr_ty tback, int lineno, int col_offset,
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1285 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1286 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1287 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1288 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1289 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1290 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1291 p->kind = Raise_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1292 p->v.Raise.type = type;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1293 p->v.Raise.inst = inst;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1294 p->v.Raise.tback = tback;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1295 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1296 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1297 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1298 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1299
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1300 stmt_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1301 TryExcept(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse, int lineno,
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1302 int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1303 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1304 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1305 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1306 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1307 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1308 p->kind = TryExcept_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1309 p->v.TryExcept.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1310 p->v.TryExcept.handlers = handlers;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1311 p->v.TryExcept.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1312 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1313 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1314 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1315 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1316
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1317 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1318 TryFinally(asdl_seq * body, asdl_seq * finalbody, int lineno, int col_offset,
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1319 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1320 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1321 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1322 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1323 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1324 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1325 p->kind = TryFinally_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1326 p->v.TryFinally.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1327 p->v.TryFinally.finalbody = finalbody;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1328 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1329 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1330 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1331 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1332
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1333 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1334 Assert(expr_ty test, expr_ty msg, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1335 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1336 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1337 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1338 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1339 "field test is required for Assert");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1340 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1341 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1342 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1343 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1344 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1345 p->kind = Assert_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1346 p->v.Assert.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1347 p->v.Assert.msg = msg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1348 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1349 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1350 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1351 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1352
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1353 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1354 Import(asdl_seq * names, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1355 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1356 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1357 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1358 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1359 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1360 p->kind = Import_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1361 p->v.Import.names = names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1362 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1363 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1364 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1365 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1366
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1367 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1368 ImportFrom(identifier module, asdl_seq * names, int level, int lineno, int
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1369 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1370 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1371 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1372 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1373 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1374 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1375 p->kind = ImportFrom_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1376 p->v.ImportFrom.module = module;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1377 p->v.ImportFrom.names = names;
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	1378 p->v.ImportFrom.level = level;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1379 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1380 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1381 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1382 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1383
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1384 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1385 Exec(expr_ty body, expr_ty globals, expr_ty locals, int lineno, int col_offset,
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1386 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1387 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1388 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1389 if (!body) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1390 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1391 "field body is required for Exec");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1392 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1393 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1394 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1395 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1396 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1397 p->kind = Exec_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1398 p->v.Exec.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1399 p->v.Exec.globals = globals;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1400 p->v.Exec.locals = locals;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1401 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1402 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1403 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1404 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1405
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1406 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1407 Global(asdl_seq * names, int lineno, int col_offset, PyArena *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 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1410 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1411 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1412 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1413 p->kind = Global_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1414 p->v.Global.names = names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1415 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1416 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1417 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1418 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1419
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1420 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1421 Expr(expr_ty value, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1422 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1423 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1424 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1425 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1426 "field value is required for Expr");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1427 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1428 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1429 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1430 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1431 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1432 p->kind = Expr_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1433 p->v.Expr.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1434 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1435 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1436 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1437 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1438
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1439 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1440 Pass(int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1441 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1442 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1443 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1444 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1445 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1446 p->kind = Pass_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1447 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1448 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1449 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1450 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1451
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1452 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1453 Break(int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1454 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1455 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1456 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1457 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1458 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1459 p->kind = Break_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1460 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1461 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1462 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1463 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1464
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1465 stmt_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1466 Continue(int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1467 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1468 stmt_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1469 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1470 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1471 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1472 p->kind = Continue_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1473 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1474 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1475 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1476 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1477
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1478 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1479 BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset, PyArena
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1480 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1481 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1482 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1483 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1484 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1485 "field op is required for BoolOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1486 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1487 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1488 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1489 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1490 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1491 p->kind = BoolOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1492 p->v.BoolOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1493 p->v.BoolOp.values = values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1494 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1495 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1496 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1497 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1498
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1499 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1500 BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int col_offset,
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1501 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1502 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1503 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1504 if (!left) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1505 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1506 "field left is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1507 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1508 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1509 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1510 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1511 "field op is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1512 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1513 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1514 if (!right) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1515 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1516 "field right is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1517 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1518 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1519 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1520 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1521 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1522 p->kind = BinOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1523 p->v.BinOp.left = left;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1524 p->v.BinOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1525 p->v.BinOp.right = right;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1526 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1527 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1528 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1531 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1532 UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset, PyArena
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1533 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1534 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1535 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1536 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1537 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1538 "field op is required for UnaryOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1539 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1540 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1541 if (!operand) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1542 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1543 "field operand is required for UnaryOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1544 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1545 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1546 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1547 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1548 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1549 p->kind = UnaryOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1550 p->v.UnaryOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1551 p->v.UnaryOp.operand = operand;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1552 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1553 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1554 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1555 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1556
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1557 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1558 Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset, PyArena
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1559 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1560 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1561 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1562 if (!args) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1563 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1564 "field args is required for Lambda");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1565 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1566 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1567 if (!body) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1568 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1569 "field body is required for Lambda");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1570 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1571 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1572 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1573 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1574 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1575 p->kind = Lambda_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1576 p->v.Lambda.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1577 p->v.Lambda.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1578 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1579 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1580 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1581 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1582
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1583 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1584 IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int col_offset,
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1585 PyArena *arena)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1586 {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1587 expr_ty p;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1588 if (!test) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1589 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1590 "field test is required for IfExp");
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1591 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1592 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1593 if (!body) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1594 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1595 "field body is required for IfExp");
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1596 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1597 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1598 if (!orelse) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1599 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1600 "field orelse is required for IfExp");
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1601 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1602 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1603 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1604 if (!p)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1605 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1606 p->kind = IfExp_kind;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1607 p->v.IfExp.test = test;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1608 p->v.IfExp.body = body;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1609 p->v.IfExp.orelse = orelse;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1610 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1611 p->col_offset = col_offset;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1612 return p;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1613 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1614
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1615 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1616 Dict(asdl_seq * keys, asdl_seq * values, int lineno, int col_offset, PyArena
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1617 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1618 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1619 expr_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1620 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1621 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1622 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1623 p->kind = Dict_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1624 p->v.Dict.keys = keys;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1625 p->v.Dict.values = values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1626 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1627 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1628 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1629 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1630
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1631 expr_ty
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1632 Set(asdl_seq * elts, int lineno, int col_offset, PyArena *arena)
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1633 {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1634 expr_ty p;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1635 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1636 if (!p)
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1637 return NULL;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1638 p->kind = Set_kind;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1639 p->v.Set.elts = elts;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1640 p->lineno = lineno;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1641 p->col_offset = col_offset;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1642 return p;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1643 }
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1644
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	1645 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1646 ListComp(expr_ty elt, asdl_seq * generators, int lineno, int col_offset,
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1647 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1648 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1649 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1650 if (!elt) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1651 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1652 "field elt is required for ListComp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1653 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1654 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1655 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1656 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1657 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1658 p->kind = ListComp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1659 p->v.ListComp.elt = elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1660 p->v.ListComp.generators = generators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1661 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1662 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1663 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1664 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1665
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1666 expr_ty
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1667 SetComp(expr_ty elt, asdl_seq * generators, int lineno, int col_offset, PyArena
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1668 *arena)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1669 {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1670 expr_ty p;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1671 if (!elt) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1672 PyErr_SetString(PyExc_ValueError,
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1673 "field elt is required for SetComp");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1674 return NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1675 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1676 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1677 if (!p)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1678 return NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1679 p->kind = SetComp_kind;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1680 p->v.SetComp.elt = elt;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1681 p->v.SetComp.generators = generators;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1682 p->lineno = lineno;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1683 p->col_offset = col_offset;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1684 return p;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1685 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1686
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1687 expr_ty
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1688 DictComp(expr_ty key, expr_ty value, asdl_seq * generators, int lineno, int
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1689 col_offset, PyArena *arena)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1690 {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1691 expr_ty p;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1692 if (!key) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1693 PyErr_SetString(PyExc_ValueError,
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1694 "field key is required for DictComp");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1695 return NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1696 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1697 if (!value) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1698 PyErr_SetString(PyExc_ValueError,
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1699 "field value is required for DictComp");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1700 return NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1701 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1702 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1703 if (!p)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1704 return NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1705 p->kind = DictComp_kind;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1706 p->v.DictComp.key = key;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1707 p->v.DictComp.value = value;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1708 p->v.DictComp.generators = generators;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1709 p->lineno = lineno;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1710 p->col_offset = col_offset;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1711 return p;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1712 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1713
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	1714 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1715 GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int col_offset,
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1716 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1717 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1718 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1719 if (!elt) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1720 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1721 "field elt is required for GeneratorExp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1722 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1723 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1724 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1725 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1726 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1727 p->kind = GeneratorExp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1728 p->v.GeneratorExp.elt = elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1729 p->v.GeneratorExp.generators = generators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1730 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1731 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1732 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1733 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1734
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1735 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1736 Yield(expr_ty value, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1737 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1738 expr_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1739 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1740 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1741 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1742 p->kind = Yield_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1743 p->v.Yield.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1744 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1745 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1746 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1747 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1748
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1749 expr_ty
37685 5e72b0c74100 Introduce asdl_int_seq, to hold cmpop_ty. Martin v. Löwis <martin@v.loewis.de> parents: 37601 diff changeset	1750 Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators, int lineno,
5e72b0c74100 Introduce asdl_int_seq, to hold cmpop_ty. Martin v. Löwis <martin@v.loewis.de> parents: 37601 diff changeset	1751 int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1752 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1753 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1754 if (!left) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1755 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1756 "field left is required for Compare");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1757 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1758 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1759 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1760 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1761 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1762 p->kind = Compare_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1763 p->v.Compare.left = left;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1764 p->v.Compare.ops = ops;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1765 p->v.Compare.comparators = comparators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1766 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1767 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1768 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1769 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1770
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1771 expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1772 Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, expr_ty starargs,
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1773 expr_ty kwargs, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1774 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1775 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1776 if (!func) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1777 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1778 "field func is required for Call");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1779 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1780 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1781 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1782 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1783 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1784 p->kind = Call_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1785 p->v.Call.func = func;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1786 p->v.Call.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1787 p->v.Call.keywords = keywords;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1788 p->v.Call.starargs = starargs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1789 p->v.Call.kwargs = kwargs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1790 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1791 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1792 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1793 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1794
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1795 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1796 Repr(expr_ty value, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1797 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1798 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1799 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1800 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1801 "field value is required for Repr");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1802 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1803 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1804 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1805 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1806 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1807 p->kind = Repr_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1808 p->v.Repr.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1809 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1810 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1811 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1812 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1813
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1814 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1815 Num(object n, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1816 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1817 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1818 if (!n) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1819 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1820 "field n is required for Num");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1821 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1822 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1823 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1824 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1825 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1826 p->kind = Num_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1827 p->v.Num.n = n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1828 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1829 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1830 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1831 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1832
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1833 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1834 Str(string s, int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1835 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1836 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1837 if (!s) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1838 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1839 "field s is required for Str");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1840 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1841 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1842 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1843 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1844 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1845 p->kind = Str_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1846 p->v.Str.s = s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1847 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1848 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1849 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1850 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1851
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1852 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1853 Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int lineno, int
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1854 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1855 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1856 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1857 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1858 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1859 "field value is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1860 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1861 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1862 if (!attr) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1863 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1864 "field attr is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1865 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1866 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1867 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1868 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1869 "field ctx is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1870 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1871 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1872 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1873 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1874 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1875 p->kind = Attribute_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1876 p->v.Attribute.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1877 p->v.Attribute.attr = attr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1878 p->v.Attribute.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1879 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1880 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1881 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1882 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1883
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1884 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1885 Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int lineno, int
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1886 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1887 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1888 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1889 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1890 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1891 "field value is required for Subscript");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1892 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1893 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1894 if (!slice) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1895 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1896 "field slice is required for Subscript");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1897 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1898 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1899 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1900 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1901 "field ctx is required for Subscript");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1902 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1903 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1904 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1905 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1906 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1907 p->kind = Subscript_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1908 p->v.Subscript.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1909 p->v.Subscript.slice = slice;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1910 p->v.Subscript.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1911 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1912 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1913 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1914 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1915
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1916 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1917 Name(identifier id, expr_context_ty ctx, int lineno, int col_offset, PyArena
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1918 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1919 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1920 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1921 if (!id) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1922 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1923 "field id is required for Name");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1924 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1925 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1926 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1927 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1928 "field ctx is required for Name");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1929 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1930 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1931 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1932 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1933 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1934 p->kind = Name_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1935 p->v.Name.id = id;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1936 p->v.Name.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1937 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1938 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1939 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1940 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1941
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1942 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1943 List(asdl_seq * elts, expr_context_ty ctx, int lineno, int col_offset, PyArena
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1944 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1945 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1946 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1947 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1948 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1949 "field ctx is required for List");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1950 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1951 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1952 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1953 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1954 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1955 p->kind = List_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1956 p->v.List.elts = elts;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1957 p->v.List.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1958 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1959 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1960 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1961 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1962
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1963 expr_ty
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1964 Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int col_offset, PyArena
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1965 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1966 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1967 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1968 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1969 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1970 "field ctx is required for Tuple");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1971 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1972 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1973 p = (expr_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1974 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1975 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1976 p->kind = Tuple_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1977 p->v.Tuple.elts = elts;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1978 p->v.Tuple.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1979 p->lineno = lineno;
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1980 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1981 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1982 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1983
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1984 slice_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1985 Ellipsis(PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1986 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1987 slice_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1988 p = (slice_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	1989 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1990 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1991 p->kind = Ellipsis_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1992 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1993 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1994
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1995 slice_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1996 Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1997 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1998 slice_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1999 p = (slice_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	2000 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2001 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2002 p->kind = Slice_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2003 p->v.Slice.lower = lower;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2004 p->v.Slice.upper = upper;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2005 p->v.Slice.step = step;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2006 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2007 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2008
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2009 slice_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2010 ExtSlice(asdl_seq * dims, PyArena *arena)
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 slice_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2013 p = (slice_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	2014 if (!p)
35742 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 p->kind = ExtSlice_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2017 p->v.ExtSlice.dims = dims;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2018 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2019 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2020
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2021 slice_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2022 Index(expr_ty value, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2023 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2024 slice_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2025 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2026 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2027 "field value is required for Index");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2028 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2029 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2030 p = (slice_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	2031 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2032 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2033 p->kind = Index_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2034 p->v.Index.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2035 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2036 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2037
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2038 comprehension_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2039 comprehension(expr_ty target, expr_ty iter, asdl_seq * ifs, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2040 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2041 comprehension_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2042 if (!target) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2043 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2044 "field target is required for comprehension");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2045 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2046 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2047 if (!iter) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2048 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2049 "field iter is required for comprehension");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2050 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2051 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2052 p = (comprehension_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	2053 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2054 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2055 p->target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2056 p->iter = iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2057 p->ifs = ifs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2058 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2059 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2060
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2061 excepthandler_ty
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	2062 ExceptHandler(expr_ty type, expr_ty name, asdl_seq * body, int lineno, int
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	2063 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2064 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2065 excepthandler_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2066 p = (excepthandler_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	2067 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2068 return NULL;
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	2069 p->kind = ExceptHandler_kind;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	2070 p->v.ExceptHandler.type = type;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	2071 p->v.ExceptHandler.name = name;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	2072 p->v.ExceptHandler.body = body;
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	2073 p->lineno = lineno;
16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	2074 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2075 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2076 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2077
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2078 arguments_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2079 arguments(asdl_seq * args, identifier vararg, identifier kwarg, asdl_seq *
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2080 defaults, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2081 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2082 arguments_ty p;
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2083 p = (arguments_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	2084 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2085 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2086 p->args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2087 p->vararg = vararg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2088 p->kwarg = kwarg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2089 p->defaults = defaults;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2090 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2091 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2092
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2093 keyword_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2094 keyword(identifier arg, expr_ty value, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2095 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2096 keyword_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2097 if (!arg) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2098 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2099 "field arg is required for keyword");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2100 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2101 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2102 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2103 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2104 "field value is required for keyword");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2105 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2106 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2107 p = (keyword_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	2108 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2109 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2110 p->arg = arg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2111 p->value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2112 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2113 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2114
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2115 alias_ty
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2116 alias(identifier name, identifier asname, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2117 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2118 alias_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2119 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2120 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2121 "field name is required for alias");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2122 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2123 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	2124 p = (alias_ty)PyArena_Malloc(arena, sizeof(*p));
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	2125 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2126 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2127 p->name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2128 p->asname = asname;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2129 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2130 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2131
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2132
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2133 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2134 ast2obj_mod(void* _o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2135 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2136 mod_ty o = (mod_ty)_o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2137 PyObject result = NULL, value = NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2138 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2139 Py_INCREF(Py_None);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2140 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2141 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2142
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2143 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2144 case Module_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2145 result = PyType_GenericNew(Module_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2146 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2147 value = ast2obj_list(o->v.Module.body, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2148 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2149 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2150 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2151 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2152 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2153 case Interactive_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2154 result = PyType_GenericNew(Interactive_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2155 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2156 value = ast2obj_list(o->v.Interactive.body, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2157 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2158 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2159 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2160 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2161 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2162 case Expression_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2163 result = PyType_GenericNew(Expression_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2164 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2165 value = ast2obj_expr(o->v.Expression.body);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2166 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2167 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2168 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2169 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2170 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2171 case Suite_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2172 result = PyType_GenericNew(Suite_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2173 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2174 value = ast2obj_list(o->v.Suite.body, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2175 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2176 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2177 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2178 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2179 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2180 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2181 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2182 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2183 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2184 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2185 return NULL;
36174 85b2d804ac0a Regenerate. Martin v. Löwis <martin@v.loewis.de> parents: 36065 diff changeset	2186 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2187
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2188 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2189 ast2obj_stmt(void* _o)
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2190 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2191 stmt_ty o = (stmt_ty)_o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2192 PyObject result = NULL, value = NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2193 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2194 Py_INCREF(Py_None);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2195 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2196 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2197
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2198 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2199 case FunctionDef_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2200 result = PyType_GenericNew(FunctionDef_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2201 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2202 value = ast2obj_identifier(o->v.FunctionDef.name);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2203 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2204 if (PyObject_SetAttrString(result, "name", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2205 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2206 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2207 value = ast2obj_arguments(o->v.FunctionDef.args);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2208 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2209 if (PyObject_SetAttrString(result, "args", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2210 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2211 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2212 value = ast2obj_list(o->v.FunctionDef.body, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2213 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2214 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2215 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2216 Py_DECREF(value);
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2217 value = ast2obj_list(o->v.FunctionDef.decorator_list,
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2218 ast2obj_expr);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2219 if (!value) goto failed;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2220 if (PyObject_SetAttrString(result, "decorator_list", value) ==
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2221 -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2222 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2223 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2224 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2225 case ClassDef_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2226 result = PyType_GenericNew(ClassDef_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2227 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2228 value = ast2obj_identifier(o->v.ClassDef.name);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2229 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2230 if (PyObject_SetAttrString(result, "name", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2231 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2232 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2233 value = ast2obj_list(o->v.ClassDef.bases, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2234 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2235 if (PyObject_SetAttrString(result, "bases", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2236 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2237 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2238 value = ast2obj_list(o->v.ClassDef.body, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2239 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2240 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2241 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2242 Py_DECREF(value);
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2243 value = ast2obj_list(o->v.ClassDef.decorator_list,
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2244 ast2obj_expr);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2245 if (!value) goto failed;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2246 if (PyObject_SetAttrString(result, "decorator_list", value) ==
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2247 -1)
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2248 goto failed;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2249 Py_DECREF(value);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2250 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2251 case Return_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2252 result = PyType_GenericNew(Return_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2253 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2254 value = ast2obj_expr(o->v.Return.value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2255 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2256 if (PyObject_SetAttrString(result, "value", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2257 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2258 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2259 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2260 case Delete_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2261 result = PyType_GenericNew(Delete_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2262 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2263 value = ast2obj_list(o->v.Delete.targets, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2264 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2265 if (PyObject_SetAttrString(result, "targets", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2266 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2267 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2268 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2269 case Assign_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2270 result = PyType_GenericNew(Assign_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2271 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2272 value = ast2obj_list(o->v.Assign.targets, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2273 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2274 if (PyObject_SetAttrString(result, "targets", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2275 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2276 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2277 value = ast2obj_expr(o->v.Assign.value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2278 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2279 if (PyObject_SetAttrString(result, "value", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2280 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2281 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2282 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2283 case AugAssign_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2284 result = PyType_GenericNew(AugAssign_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2285 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2286 value = ast2obj_expr(o->v.AugAssign.target);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2287 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2288 if (PyObject_SetAttrString(result, "target", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2289 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2290 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2291 value = ast2obj_operator(o->v.AugAssign.op);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2292 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2293 if (PyObject_SetAttrString(result, "op", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2294 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2295 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2296 value = ast2obj_expr(o->v.AugAssign.value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2297 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2298 if (PyObject_SetAttrString(result, "value", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2299 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2300 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2301 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2302 case Print_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2303 result = PyType_GenericNew(Print_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2304 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2305 value = ast2obj_expr(o->v.Print.dest);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2306 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2307 if (PyObject_SetAttrString(result, "dest", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2308 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2309 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2310 value = ast2obj_list(o->v.Print.values, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2311 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2312 if (PyObject_SetAttrString(result, "values", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2313 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2314 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2315 value = ast2obj_bool(o->v.Print.nl);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2316 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2317 if (PyObject_SetAttrString(result, "nl", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2318 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2319 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2320 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2321 case For_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2322 result = PyType_GenericNew(For_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2323 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2324 value = ast2obj_expr(o->v.For.target);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2325 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2326 if (PyObject_SetAttrString(result, "target", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2327 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2328 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2329 value = ast2obj_expr(o->v.For.iter);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2330 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2331 if (PyObject_SetAttrString(result, "iter", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2332 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2333 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2334 value = ast2obj_list(o->v.For.body, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2335 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2336 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2337 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2338 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2339 value = ast2obj_list(o->v.For.orelse, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2340 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2341 if (PyObject_SetAttrString(result, "orelse", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2342 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2343 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2344 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2345 case While_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2346 result = PyType_GenericNew(While_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2347 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2348 value = ast2obj_expr(o->v.While.test);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2349 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2350 if (PyObject_SetAttrString(result, "test", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2351 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2352 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2353 value = ast2obj_list(o->v.While.body, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2354 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2355 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2356 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2357 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2358 value = ast2obj_list(o->v.While.orelse, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2359 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2360 if (PyObject_SetAttrString(result, "orelse", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2361 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2362 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2363 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2364 case If_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2365 result = PyType_GenericNew(If_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2366 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2367 value = ast2obj_expr(o->v.If.test);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2368 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2369 if (PyObject_SetAttrString(result, "test", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2370 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2371 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2372 value = ast2obj_list(o->v.If.body, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2373 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2374 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2375 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2376 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2377 value = ast2obj_list(o->v.If.orelse, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2378 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2379 if (PyObject_SetAttrString(result, "orelse", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2380 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2381 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2382 break;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2383 case With_kind:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2384 result = PyType_GenericNew(With_type, NULL, NULL);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2385 if (!result) goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2386 value = ast2obj_expr(o->v.With.context_expr);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2387 if (!value) goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2388 if (PyObject_SetAttrString(result, "context_expr", value) == -1)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2389 goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2390 Py_DECREF(value);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2391 value = ast2obj_expr(o->v.With.optional_vars);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2392 if (!value) goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2393 if (PyObject_SetAttrString(result, "optional_vars", value) ==
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2394 -1)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2395 goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2396 Py_DECREF(value);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2397 value = ast2obj_list(o->v.With.body, ast2obj_stmt);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2398 if (!value) goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2399 if (PyObject_SetAttrString(result, "body", value) == -1)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2400 goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2401 Py_DECREF(value);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2402 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2403 case Raise_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2404 result = PyType_GenericNew(Raise_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2405 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2406 value = ast2obj_expr(o->v.Raise.type);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2407 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2408 if (PyObject_SetAttrString(result, "type", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2409 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2410 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2411 value = ast2obj_expr(o->v.Raise.inst);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2412 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2413 if (PyObject_SetAttrString(result, "inst", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2414 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2415 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2416 value = ast2obj_expr(o->v.Raise.tback);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2417 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2418 if (PyObject_SetAttrString(result, "tback", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2419 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2420 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2421 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2422 case TryExcept_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2423 result = PyType_GenericNew(TryExcept_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2424 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2425 value = ast2obj_list(o->v.TryExcept.body, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2426 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2427 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2428 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2429 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2430 value = ast2obj_list(o->v.TryExcept.handlers,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2431 ast2obj_excepthandler);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2432 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2433 if (PyObject_SetAttrString(result, "handlers", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2434 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2435 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2436 value = ast2obj_list(o->v.TryExcept.orelse, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2437 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2438 if (PyObject_SetAttrString(result, "orelse", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2439 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2440 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2441 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2442 case TryFinally_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2443 result = PyType_GenericNew(TryFinally_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2444 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2445 value = ast2obj_list(o->v.TryFinally.body, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2446 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2447 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2448 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2449 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2450 value = ast2obj_list(o->v.TryFinally.finalbody, ast2obj_stmt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2451 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2452 if (PyObject_SetAttrString(result, "finalbody", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2453 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2454 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2455 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2456 case Assert_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2457 result = PyType_GenericNew(Assert_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2458 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2459 value = ast2obj_expr(o->v.Assert.test);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2460 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2461 if (PyObject_SetAttrString(result, "test", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2462 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2463 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2464 value = ast2obj_expr(o->v.Assert.msg);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2465 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2466 if (PyObject_SetAttrString(result, "msg", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2467 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2468 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2469 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2470 case Import_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2471 result = PyType_GenericNew(Import_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2472 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2473 value = ast2obj_list(o->v.Import.names, ast2obj_alias);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2474 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2475 if (PyObject_SetAttrString(result, "names", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2476 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2477 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2478 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2479 case ImportFrom_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2480 result = PyType_GenericNew(ImportFrom_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2481 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2482 value = ast2obj_identifier(o->v.ImportFrom.module);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2483 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2484 if (PyObject_SetAttrString(result, "module", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2485 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2486 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2487 value = ast2obj_list(o->v.ImportFrom.names, ast2obj_alias);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2488 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2489 if (PyObject_SetAttrString(result, "names", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2490 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2491 Py_DECREF(value);
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2492 value = ast2obj_int(o->v.ImportFrom.level);
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2493 if (!value) goto failed;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2494 if (PyObject_SetAttrString(result, "level", value) == -1)
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2495 goto failed;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2496 Py_DECREF(value);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2497 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2498 case Exec_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2499 result = PyType_GenericNew(Exec_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2500 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2501 value = ast2obj_expr(o->v.Exec.body);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2502 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2503 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2504 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2505 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2506 value = ast2obj_expr(o->v.Exec.globals);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2507 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2508 if (PyObject_SetAttrString(result, "globals", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2509 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2510 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2511 value = ast2obj_expr(o->v.Exec.locals);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2512 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2513 if (PyObject_SetAttrString(result, "locals", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2514 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2515 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2516 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2517 case Global_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2518 result = PyType_GenericNew(Global_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2519 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2520 value = ast2obj_list(o->v.Global.names, ast2obj_identifier);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2521 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2522 if (PyObject_SetAttrString(result, "names", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2523 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2524 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2525 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2526 case Expr_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2527 result = PyType_GenericNew(Expr_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2528 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2529 value = ast2obj_expr(o->v.Expr.value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2530 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2531 if (PyObject_SetAttrString(result, "value", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2532 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2533 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2534 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2535 case Pass_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2536 result = PyType_GenericNew(Pass_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2537 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2538 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2539 case Break_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2540 result = PyType_GenericNew(Break_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2541 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2542 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2543 case Continue_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2544 result = PyType_GenericNew(Continue_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2545 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2546 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2547 }
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2548 value = ast2obj_int(o->lineno);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2549 if (!value) goto failed;
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2550 if (PyObject_SetAttrString(result, "lineno", value) < 0)
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2551 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2552 Py_DECREF(value);
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	2553 value = ast2obj_int(o->col_offset);
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	2554 if (!value) goto failed;
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2555 if (PyObject_SetAttrString(result, "col_offset", value) < 0)
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2556 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2557 Py_DECREF(value);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2558 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2559 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2560 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2561 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2562 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2563 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2564
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2565 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2566 ast2obj_expr(void* _o)
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2567 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2568 expr_ty o = (expr_ty)_o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2569 PyObject result = NULL, value = NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2570 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2571 Py_INCREF(Py_None);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2572 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2573 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2574
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2575 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2576 case BoolOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2577 result = PyType_GenericNew(BoolOp_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2578 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2579 value = ast2obj_boolop(o->v.BoolOp.op);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2580 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2581 if (PyObject_SetAttrString(result, "op", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2582 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2583 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2584 value = ast2obj_list(o->v.BoolOp.values, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2585 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2586 if (PyObject_SetAttrString(result, "values", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2587 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2588 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2589 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2590 case BinOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2591 result = PyType_GenericNew(BinOp_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2592 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2593 value = ast2obj_expr(o->v.BinOp.left);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2594 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2595 if (PyObject_SetAttrString(result, "left", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2596 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2597 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2598 value = ast2obj_operator(o->v.BinOp.op);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2599 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2600 if (PyObject_SetAttrString(result, "op", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2601 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2602 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2603 value = ast2obj_expr(o->v.BinOp.right);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2604 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2605 if (PyObject_SetAttrString(result, "right", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2606 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2607 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2608 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2609 case UnaryOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2610 result = PyType_GenericNew(UnaryOp_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2611 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2612 value = ast2obj_unaryop(o->v.UnaryOp.op);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2613 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2614 if (PyObject_SetAttrString(result, "op", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2615 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2616 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2617 value = ast2obj_expr(o->v.UnaryOp.operand);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2618 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2619 if (PyObject_SetAttrString(result, "operand", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2620 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2621 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2622 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2623 case Lambda_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2624 result = PyType_GenericNew(Lambda_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2625 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2626 value = ast2obj_arguments(o->v.Lambda.args);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2627 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2628 if (PyObject_SetAttrString(result, "args", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2629 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2630 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2631 value = ast2obj_expr(o->v.Lambda.body);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2632 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2633 if (PyObject_SetAttrString(result, "body", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2634 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2635 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2636 break;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2637 case IfExp_kind:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2638 result = PyType_GenericNew(IfExp_type, NULL, NULL);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2639 if (!result) goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2640 value = ast2obj_expr(o->v.IfExp.test);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2641 if (!value) goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2642 if (PyObject_SetAttrString(result, "test", value) == -1)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2643 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2644 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2645 value = ast2obj_expr(o->v.IfExp.body);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2646 if (!value) goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2647 if (PyObject_SetAttrString(result, "body", value) == -1)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2648 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2649 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2650 value = ast2obj_expr(o->v.IfExp.orelse);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2651 if (!value) goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2652 if (PyObject_SetAttrString(result, "orelse", value) == -1)
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2653 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2654 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2655 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2656 case Dict_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2657 result = PyType_GenericNew(Dict_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2658 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2659 value = ast2obj_list(o->v.Dict.keys, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2660 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2661 if (PyObject_SetAttrString(result, "keys", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2662 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2663 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2664 value = ast2obj_list(o->v.Dict.values, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2665 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2666 if (PyObject_SetAttrString(result, "values", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2667 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2668 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2669 break;
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	2670 case Set_kind:
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	2671 result = PyType_GenericNew(Set_type, NULL, NULL);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	2672 if (!result) goto failed;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	2673 value = ast2obj_list(o->v.Set.elts, ast2obj_expr);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	2674 if (!value) goto failed;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	2675 if (PyObject_SetAttrString(result, "elts", value) == -1)
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	2676 goto failed;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	2677 Py_DECREF(value);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	2678 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2679 case ListComp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2680 result = PyType_GenericNew(ListComp_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2681 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2682 value = ast2obj_expr(o->v.ListComp.elt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2683 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2684 if (PyObject_SetAttrString(result, "elt", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2685 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2686 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2687 value = ast2obj_list(o->v.ListComp.generators,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2688 ast2obj_comprehension);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2689 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2690 if (PyObject_SetAttrString(result, "generators", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2691 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2692 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2693 break;
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2694 case SetComp_kind:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2695 result = PyType_GenericNew(SetComp_type, NULL, NULL);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2696 if (!result) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2697 value = ast2obj_expr(o->v.SetComp.elt);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2698 if (!value) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2699 if (PyObject_SetAttrString(result, "elt", value) == -1)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2700 goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2701 Py_DECREF(value);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2702 value = ast2obj_list(o->v.SetComp.generators,
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2703 ast2obj_comprehension);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2704 if (!value) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2705 if (PyObject_SetAttrString(result, "generators", value) == -1)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2706 goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2707 Py_DECREF(value);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2708 break;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2709 case DictComp_kind:
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2710 result = PyType_GenericNew(DictComp_type, NULL, NULL);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2711 if (!result) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2712 value = ast2obj_expr(o->v.DictComp.key);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2713 if (!value) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2714 if (PyObject_SetAttrString(result, "key", value) == -1)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2715 goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2716 Py_DECREF(value);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2717 value = ast2obj_expr(o->v.DictComp.value);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2718 if (!value) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2719 if (PyObject_SetAttrString(result, "value", value) == -1)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2720 goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2721 Py_DECREF(value);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2722 value = ast2obj_list(o->v.DictComp.generators,
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2723 ast2obj_comprehension);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2724 if (!value) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2725 if (PyObject_SetAttrString(result, "generators", value) == -1)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2726 goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2727 Py_DECREF(value);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	2728 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2729 case GeneratorExp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2730 result = PyType_GenericNew(GeneratorExp_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2731 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2732 value = ast2obj_expr(o->v.GeneratorExp.elt);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2733 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2734 if (PyObject_SetAttrString(result, "elt", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2735 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2736 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2737 value = ast2obj_list(o->v.GeneratorExp.generators,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2738 ast2obj_comprehension);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2739 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2740 if (PyObject_SetAttrString(result, "generators", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2741 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2742 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2743 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2744 case Yield_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2745 result = PyType_GenericNew(Yield_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2746 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2747 value = ast2obj_expr(o->v.Yield.value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2748 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2749 if (PyObject_SetAttrString(result, "value", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2750 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2751 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2752 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2753 case Compare_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2754 result = PyType_GenericNew(Compare_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2755 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2756 value = ast2obj_expr(o->v.Compare.left);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2757 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2758 if (PyObject_SetAttrString(result, "left", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2759 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2760 Py_DECREF(value);
36661 710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2761 {
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2762 int i, n = asdl_seq_LEN(o->v.Compare.ops);
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2763 value = PyList_New(n);
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2764 if (!value) goto failed;
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2765 for(i = 0; i < n; i++)
37685 5e72b0c74100 Introduce asdl_int_seq, to hold cmpop_ty. Martin v. Löwis <martin@v.loewis.de> parents: 37601 diff changeset	2766 PyList_SET_ITEM(value, i, ast2obj_cmpop((cmpop_ty)asdl_seq_GET(o->v.Compare.ops, i)));
36661 710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2767 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2768 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2769 if (PyObject_SetAttrString(result, "ops", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2770 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2771 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2772 value = ast2obj_list(o->v.Compare.comparators, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2773 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2774 if (PyObject_SetAttrString(result, "comparators", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2775 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2776 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2777 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2778 case Call_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2779 result = PyType_GenericNew(Call_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2780 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2781 value = ast2obj_expr(o->v.Call.func);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2782 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2783 if (PyObject_SetAttrString(result, "func", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2784 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2785 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2786 value = ast2obj_list(o->v.Call.args, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2787 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2788 if (PyObject_SetAttrString(result, "args", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2789 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2790 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2791 value = ast2obj_list(o->v.Call.keywords, ast2obj_keyword);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2792 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2793 if (PyObject_SetAttrString(result, "keywords", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2794 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2795 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2796 value = ast2obj_expr(o->v.Call.starargs);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2797 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2798 if (PyObject_SetAttrString(result, "starargs", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2799 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2800 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2801 value = ast2obj_expr(o->v.Call.kwargs);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2802 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2803 if (PyObject_SetAttrString(result, "kwargs", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2804 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2805 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2806 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2807 case Repr_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2808 result = PyType_GenericNew(Repr_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2809 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2810 value = ast2obj_expr(o->v.Repr.value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2811 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2812 if (PyObject_SetAttrString(result, "value", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2813 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2814 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2815 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2816 case Num_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2817 result = PyType_GenericNew(Num_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2818 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2819 value = ast2obj_object(o->v.Num.n);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2820 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2821 if (PyObject_SetAttrString(result, "n", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2822 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2823 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2824 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2825 case Str_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2826 result = PyType_GenericNew(Str_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2827 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2828 value = ast2obj_string(o->v.Str.s);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2829 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2830 if (PyObject_SetAttrString(result, "s", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2831 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2832 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2833 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2834 case Attribute_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2835 result = PyType_GenericNew(Attribute_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2836 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2837 value = ast2obj_expr(o->v.Attribute.value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2838 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2839 if (PyObject_SetAttrString(result, "value", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2840 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2841 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2842 value = ast2obj_identifier(o->v.Attribute.attr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2843 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2844 if (PyObject_SetAttrString(result, "attr", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2845 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2846 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2847 value = ast2obj_expr_context(o->v.Attribute.ctx);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2848 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2849 if (PyObject_SetAttrString(result, "ctx", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2850 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2851 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2852 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2853 case Subscript_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2854 result = PyType_GenericNew(Subscript_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2855 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2856 value = ast2obj_expr(o->v.Subscript.value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2857 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2858 if (PyObject_SetAttrString(result, "value", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2859 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2860 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2861 value = ast2obj_slice(o->v.Subscript.slice);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2862 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2863 if (PyObject_SetAttrString(result, "slice", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2864 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2865 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2866 value = ast2obj_expr_context(o->v.Subscript.ctx);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2867 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2868 if (PyObject_SetAttrString(result, "ctx", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2869 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2870 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2871 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2872 case Name_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2873 result = PyType_GenericNew(Name_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2874 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2875 value = ast2obj_identifier(o->v.Name.id);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2876 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2877 if (PyObject_SetAttrString(result, "id", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2878 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2879 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2880 value = ast2obj_expr_context(o->v.Name.ctx);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2881 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2882 if (PyObject_SetAttrString(result, "ctx", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2883 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2884 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2885 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2886 case List_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2887 result = PyType_GenericNew(List_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2888 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2889 value = ast2obj_list(o->v.List.elts, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2890 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2891 if (PyObject_SetAttrString(result, "elts", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2892 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2893 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2894 value = ast2obj_expr_context(o->v.List.ctx);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2895 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2896 if (PyObject_SetAttrString(result, "ctx", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2897 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2898 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2899 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2900 case Tuple_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2901 result = PyType_GenericNew(Tuple_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2902 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2903 value = ast2obj_list(o->v.Tuple.elts, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2904 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2905 if (PyObject_SetAttrString(result, "elts", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2906 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2907 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2908 value = ast2obj_expr_context(o->v.Tuple.ctx);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2909 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2910 if (PyObject_SetAttrString(result, "ctx", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2911 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2912 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2913 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2914 }
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2915 value = ast2obj_int(o->lineno);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2916 if (!value) goto failed;
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2917 if (PyObject_SetAttrString(result, "lineno", value) < 0)
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2918 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2919 Py_DECREF(value);
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	2920 value = ast2obj_int(o->col_offset);
57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	2921 if (!value) goto failed;
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2922 if (PyObject_SetAttrString(result, "col_offset", value) < 0)
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2923 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2924 Py_DECREF(value);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2925 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2926 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2927 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2928 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2929 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2930 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2931
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2932 PyObject* ast2obj_expr_context(expr_context_ty o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2933 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2934 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2935 case Load:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2936 Py_INCREF(Load_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2937 return Load_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2938 case Store:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2939 Py_INCREF(Store_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2940 return Store_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2941 case Del:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2942 Py_INCREF(Del_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2943 return Del_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2944 case AugLoad:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2945 Py_INCREF(AugLoad_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2946 return AugLoad_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2947 case AugStore:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2948 Py_INCREF(AugStore_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2949 return AugStore_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2950 case Param:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2951 Py_INCREF(Param_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2952 return Param_singleton;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2953 default:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2954 /* should never happen, but just in case ... */
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2955 PyErr_Format(PyExc_SystemError, "unknown expr_context found");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2956 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2957 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2958 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2959 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2960 ast2obj_slice(void* _o)
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2961 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2962 slice_ty o = (slice_ty)_o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2963 PyObject result = NULL, value = NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2964 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2965 Py_INCREF(Py_None);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2966 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2967 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2968
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2969 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2970 case Ellipsis_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2971 result = PyType_GenericNew(Ellipsis_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2972 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2973 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2974 case Slice_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2975 result = PyType_GenericNew(Slice_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2976 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2977 value = ast2obj_expr(o->v.Slice.lower);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2978 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2979 if (PyObject_SetAttrString(result, "lower", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2980 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2981 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2982 value = ast2obj_expr(o->v.Slice.upper);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2983 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2984 if (PyObject_SetAttrString(result, "upper", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2985 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2986 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2987 value = ast2obj_expr(o->v.Slice.step);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2988 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2989 if (PyObject_SetAttrString(result, "step", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2990 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2991 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2992 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2993 case ExtSlice_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2994 result = PyType_GenericNew(ExtSlice_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2995 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2996 value = ast2obj_list(o->v.ExtSlice.dims, ast2obj_slice);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2997 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2998 if (PyObject_SetAttrString(result, "dims", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2999 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3000 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3001 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3002 case Index_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3003 result = PyType_GenericNew(Index_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3004 if (!result) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3005 value = ast2obj_expr(o->v.Index.value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3006 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3007 if (PyObject_SetAttrString(result, "value", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3008 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3009 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3010 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3011 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3012 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3013 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3014 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3015 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3016 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3017 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3018
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3019 PyObject* ast2obj_boolop(boolop_ty o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3020 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3021 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3022 case And:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3023 Py_INCREF(And_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3024 return And_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3025 case Or:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3026 Py_INCREF(Or_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3027 return Or_singleton;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3028 default:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3029 /* should never happen, but just in case ... */
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3030 PyErr_Format(PyExc_SystemError, "unknown boolop found");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3031 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3032 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3033 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3034 PyObject* ast2obj_operator(operator_ty o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3035 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3036 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3037 case Add:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3038 Py_INCREF(Add_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3039 return Add_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3040 case Sub:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3041 Py_INCREF(Sub_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3042 return Sub_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3043 case Mult:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3044 Py_INCREF(Mult_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3045 return Mult_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3046 case Div:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3047 Py_INCREF(Div_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3048 return Div_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3049 case Mod:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3050 Py_INCREF(Mod_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3051 return Mod_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3052 case Pow:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3053 Py_INCREF(Pow_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3054 return Pow_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3055 case LShift:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3056 Py_INCREF(LShift_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3057 return LShift_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3058 case RShift:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3059 Py_INCREF(RShift_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3060 return RShift_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3061 case BitOr:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3062 Py_INCREF(BitOr_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3063 return BitOr_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3064 case BitXor:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3065 Py_INCREF(BitXor_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3066 return BitXor_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3067 case BitAnd:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3068 Py_INCREF(BitAnd_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3069 return BitAnd_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3070 case FloorDiv:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3071 Py_INCREF(FloorDiv_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3072 return FloorDiv_singleton;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3073 default:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3074 /* should never happen, but just in case ... */
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3075 PyErr_Format(PyExc_SystemError, "unknown operator found");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3076 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3077 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3078 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3079 PyObject* ast2obj_unaryop(unaryop_ty o)
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3080 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3081 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3082 case Invert:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3083 Py_INCREF(Invert_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3084 return Invert_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3085 case Not:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3086 Py_INCREF(Not_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3087 return Not_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3088 case UAdd:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3089 Py_INCREF(UAdd_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3090 return UAdd_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3091 case USub:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3092 Py_INCREF(USub_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3093 return USub_singleton;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3094 default:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3095 /* should never happen, but just in case ... */
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3096 PyErr_Format(PyExc_SystemError, "unknown unaryop found");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3097 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3098 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3099 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3100 PyObject* ast2obj_cmpop(cmpop_ty o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3101 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3102 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3103 case Eq:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3104 Py_INCREF(Eq_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3105 return Eq_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3106 case NotEq:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3107 Py_INCREF(NotEq_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3108 return NotEq_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3109 case Lt:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3110 Py_INCREF(Lt_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3111 return Lt_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3112 case LtE:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3113 Py_INCREF(LtE_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3114 return LtE_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3115 case Gt:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3116 Py_INCREF(Gt_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3117 return Gt_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3118 case GtE:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3119 Py_INCREF(GtE_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3120 return GtE_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3121 case Is:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3122 Py_INCREF(Is_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3123 return Is_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3124 case IsNot:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3125 Py_INCREF(IsNot_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3126 return IsNot_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3127 case In:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3128 Py_INCREF(In_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3129 return In_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3130 case NotIn:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3131 Py_INCREF(NotIn_singleton);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3132 return NotIn_singleton;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3133 default:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3134 /* should never happen, but just in case ... */
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3135 PyErr_Format(PyExc_SystemError, "unknown cmpop found");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3136 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3137 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3138 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3139 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3140 ast2obj_comprehension(void* _o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3141 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3142 comprehension_ty o = (comprehension_ty)_o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3143 PyObject result = NULL, value = NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3144 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3145 Py_INCREF(Py_None);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3146 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3147 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3148
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3149 result = PyType_GenericNew(comprehension_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3150 if (!result) return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3151 value = ast2obj_expr(o->target);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3152 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3153 if (PyObject_SetAttrString(result, "target", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3154 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3155 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3156 value = ast2obj_expr(o->iter);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3157 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3158 if (PyObject_SetAttrString(result, "iter", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3159 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3160 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3161 value = ast2obj_list(o->ifs, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3162 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3163 if (PyObject_SetAttrString(result, "ifs", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3164 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3165 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3166 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3167 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3168 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3169 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3170 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3171 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3172
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3173 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3174 ast2obj_excepthandler(void* _o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3175 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3176 excepthandler_ty o = (excepthandler_ty)_o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3177 PyObject result = NULL, value = NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3178 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3179 Py_INCREF(Py_None);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3180 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3181 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3182
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3183 switch (o->kind) {
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3184 case ExceptHandler_kind:
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3185 result = PyType_GenericNew(ExceptHandler_type, NULL, NULL);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3186 if (!result) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3187 value = ast2obj_expr(o->v.ExceptHandler.type);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3188 if (!value) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3189 if (PyObject_SetAttrString(result, "type", value) == -1)
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3190 goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3191 Py_DECREF(value);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3192 value = ast2obj_expr(o->v.ExceptHandler.name);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3193 if (!value) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3194 if (PyObject_SetAttrString(result, "name", value) == -1)
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3195 goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3196 Py_DECREF(value);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3197 value = ast2obj_list(o->v.ExceptHandler.body, ast2obj_stmt);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3198 if (!value) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3199 if (PyObject_SetAttrString(result, "body", value) == -1)
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3200 goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3201 Py_DECREF(value);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3202 break;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3203 }
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	3204 value = ast2obj_int(o->lineno);
16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	3205 if (!value) goto failed;
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3206 if (PyObject_SetAttrString(result, "lineno", value) < 0)
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	3207 goto failed;
16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	3208 Py_DECREF(value);
16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	3209 value = ast2obj_int(o->col_offset);
16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	3210 if (!value) goto failed;
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	3211 if (PyObject_SetAttrString(result, "col_offset", value) < 0)
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	3212 goto failed;
16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	3213 Py_DECREF(value);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3214 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3215 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3216 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3217 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3218 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3219 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3220
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3221 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3222 ast2obj_arguments(void* _o)
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3223 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3224 arguments_ty o = (arguments_ty)_o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3225 PyObject result = NULL, value = NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3226 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3227 Py_INCREF(Py_None);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3228 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3229 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3230
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3231 result = PyType_GenericNew(arguments_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3232 if (!result) return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3233 value = ast2obj_list(o->args, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3234 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3235 if (PyObject_SetAttrString(result, "args", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3236 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3237 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3238 value = ast2obj_identifier(o->vararg);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3239 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3240 if (PyObject_SetAttrString(result, "vararg", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3241 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3242 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3243 value = ast2obj_identifier(o->kwarg);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3244 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3245 if (PyObject_SetAttrString(result, "kwarg", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3246 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3247 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3248 value = ast2obj_list(o->defaults, ast2obj_expr);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3249 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3250 if (PyObject_SetAttrString(result, "defaults", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3251 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3252 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3253 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3254 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3255 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3256 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3257 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3258 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3259
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3260 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3261 ast2obj_keyword(void* _o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3262 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3263 keyword_ty o = (keyword_ty)_o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3264 PyObject result = NULL, value = NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3265 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3266 Py_INCREF(Py_None);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3267 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3268 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3269
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3270 result = PyType_GenericNew(keyword_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3271 if (!result) return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3272 value = ast2obj_identifier(o->arg);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3273 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3274 if (PyObject_SetAttrString(result, "arg", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3275 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3276 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3277 value = ast2obj_expr(o->value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3278 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3279 if (PyObject_SetAttrString(result, "value", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3280 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3281 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3282 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3283 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3284 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3285 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3286 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3287 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3288
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3289 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3290 ast2obj_alias(void* _o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3291 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3292 alias_ty o = (alias_ty)_o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3293 PyObject result = NULL, value = NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3294 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3295 Py_INCREF(Py_None);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3296 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3297 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3298
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3299 result = PyType_GenericNew(alias_type, NULL, NULL);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3300 if (!result) return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3301 value = ast2obj_identifier(o->name);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3302 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3303 if (PyObject_SetAttrString(result, "name", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3304 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3305 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3306 value = ast2obj_identifier(o->asname);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3307 if (!value) goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3308 if (PyObject_SetAttrString(result, "asname", value) == -1)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3309 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3310 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3311 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3312 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3313 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3314 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3315 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3316 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3317
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3318
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3319 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3320 obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3321 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3322 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3323 int isinstance;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3324
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3325
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3326 if (obj == Py_None) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3327 *out = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3328 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3329 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3330 isinstance = PyObject_IsInstance(obj, (PyObject*)Module_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3331 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3332 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3333 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3334 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3335 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3336
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3337 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3338 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3339 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3340 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3341 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3342 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3343 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3344 PyErr_Format(PyExc_TypeError, "Module field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3345 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3346 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3347 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3348 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3349 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3350 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3351 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3352 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3353 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3354 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3355 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3356 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3357 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3358 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3359 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Module");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3360 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3361 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3362 *out = Module(body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3363 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3364 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3365 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3366 isinstance = PyObject_IsInstance(obj, (PyObject*)Interactive_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3367 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3368 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3369 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3370 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3371 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3372
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3373 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3374 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3375 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3376 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3377 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3378 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3379 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3380 PyErr_Format(PyExc_TypeError, "Interactive field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3381 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3382 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3383 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3384 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3385 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3386 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3387 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3388 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3389 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3390 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3391 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3392 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3393 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3394 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3395 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Interactive");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3396 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3397 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3398 *out = Interactive(body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3399 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3400 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3401 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3402 isinstance = PyObject_IsInstance(obj, (PyObject*)Expression_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3403 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3404 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3405 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3406 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3407 expr_ty body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3408
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3409 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3410 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3411 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3412 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3413 res = obj2ast_expr(tmp, &body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3414 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3415 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3416 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3417 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3418 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Expression");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3419 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3420 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3421 *out = Expression(body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3422 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3423 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3424 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3425 isinstance = PyObject_IsInstance(obj, (PyObject*)Suite_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3426 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3427 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3428 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3429 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3430 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3431
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3432 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3433 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3434 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3435 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3436 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3437 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3438 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3439 PyErr_Format(PyExc_TypeError, "Suite field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3440 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3441 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3442 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3443 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3444 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3445 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3446 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3447 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3448 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3449 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3450 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3451 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3452 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3453 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3454 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Suite");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3455 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3456 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3457 *out = Suite(body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3458 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3459 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3460 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3461
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3462 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3463 if (tmp == NULL) goto failed;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	3464 PyErr_Format(PyExc_TypeError, "expected some sort of mod, but got %.400s", PyString_AS_STRING(tmp));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3465 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3466 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3467 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3468 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3469
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3470 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3471 obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3472 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3473 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3474 int isinstance;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3475
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3476 int lineno;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3477 int col_offset;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3478
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3479 if (obj == Py_None) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3480 *out = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3481 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3482 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3483 if (PyObject_HasAttrString(obj, "lineno")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3484 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3485 tmp = PyObject_GetAttrString(obj, "lineno");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3486 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3487 res = obj2ast_int(tmp, &lineno, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3488 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3489 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3490 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3491 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3492 PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from stmt");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3493 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3494 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3495 if (PyObject_HasAttrString(obj, "col_offset")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3496 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3497 tmp = PyObject_GetAttrString(obj, "col_offset");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3498 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3499 res = obj2ast_int(tmp, &col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3500 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3501 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3502 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3503 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3504 PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from stmt");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3505 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3506 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3507 isinstance = PyObject_IsInstance(obj, (PyObject*)FunctionDef_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3508 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3509 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3510 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3511 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3512 identifier name;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3513 arguments_ty args;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3514 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3515 asdl_seq* decorator_list;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3516
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3517 if (PyObject_HasAttrString(obj, "name")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3518 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3519 tmp = PyObject_GetAttrString(obj, "name");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3520 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3521 res = obj2ast_identifier(tmp, &name, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3522 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3523 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3524 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3525 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3526 PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from FunctionDef");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3527 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3528 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3529 if (PyObject_HasAttrString(obj, "args")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3530 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3531 tmp = PyObject_GetAttrString(obj, "args");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3532 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3533 res = obj2ast_arguments(tmp, &args, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3534 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3535 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3536 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3537 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3538 PyErr_SetString(PyExc_TypeError, "required field \"args\" missing from FunctionDef");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3539 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3540 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3541 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3542 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3543 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3544 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3545 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3546 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3547 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3548 PyErr_Format(PyExc_TypeError, "FunctionDef field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3549 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3550 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3551 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3552 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3553 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3554 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3555 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3556 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3557 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3558 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3559 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3560 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3561 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3562 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3563 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from FunctionDef");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3564 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3565 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3566 if (PyObject_HasAttrString(obj, "decorator_list")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3567 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3568 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3569 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3570 tmp = PyObject_GetAttrString(obj, "decorator_list");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3571 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3572 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3573 PyErr_Format(PyExc_TypeError, "FunctionDef field \"decorator_list\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3574 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3575 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3576 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3577 decorator_list = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3578 if (decorator_list == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3579 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3580 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3581 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3582 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3583 asdl_seq_SET(decorator_list, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3584 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3585 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3586 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3587 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3588 PyErr_SetString(PyExc_TypeError, "required field \"decorator_list\" missing from FunctionDef");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3589 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3590 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3591 *out = FunctionDef(name, args, body, decorator_list, lineno,
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3592 col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3593 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3594 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3595 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3596 isinstance = PyObject_IsInstance(obj, (PyObject*)ClassDef_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3597 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3598 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3599 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3600 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3601 identifier name;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3602 asdl_seq* bases;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3603 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3604 asdl_seq* decorator_list;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3605
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3606 if (PyObject_HasAttrString(obj, "name")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3607 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3608 tmp = PyObject_GetAttrString(obj, "name");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3609 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3610 res = obj2ast_identifier(tmp, &name, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3611 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3612 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3613 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3614 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3615 PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from ClassDef");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3616 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3617 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3618 if (PyObject_HasAttrString(obj, "bases")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3619 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3620 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3621 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3622 tmp = PyObject_GetAttrString(obj, "bases");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3623 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3624 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3625 PyErr_Format(PyExc_TypeError, "ClassDef field \"bases\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3626 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3627 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3628 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3629 bases = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3630 if (bases == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3631 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3632 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3633 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3634 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3635 asdl_seq_SET(bases, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3636 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3637 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3638 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3639 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3640 PyErr_SetString(PyExc_TypeError, "required field \"bases\" missing from ClassDef");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3641 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3642 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3643 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3644 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3645 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3646 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3647 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3648 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3649 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3650 PyErr_Format(PyExc_TypeError, "ClassDef field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3651 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3652 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3653 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3654 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3655 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3656 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3657 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3658 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3659 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3660 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3661 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3662 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3663 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3664 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3665 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from ClassDef");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3666 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3667 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3668 if (PyObject_HasAttrString(obj, "decorator_list")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3669 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3670 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3671 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3672 tmp = PyObject_GetAttrString(obj, "decorator_list");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3673 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3674 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3675 PyErr_Format(PyExc_TypeError, "ClassDef field \"decorator_list\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3676 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3677 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3678 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3679 decorator_list = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3680 if (decorator_list == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3681 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3682 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3683 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3684 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3685 asdl_seq_SET(decorator_list, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3686 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3687 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3688 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3689 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3690 PyErr_SetString(PyExc_TypeError, "required field \"decorator_list\" missing from ClassDef");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3691 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3692 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3693 *out = ClassDef(name, bases, body, decorator_list, lineno,
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3694 col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3695 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3696 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3697 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3698 isinstance = PyObject_IsInstance(obj, (PyObject*)Return_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3699 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3700 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3701 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3702 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3703 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3704
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3705 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3706 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3707 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3708 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3709 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3710 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3711 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3712 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3713 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3714 value = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3715 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3716 *out = Return(value, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3717 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3718 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3719 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3720 isinstance = PyObject_IsInstance(obj, (PyObject*)Delete_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3721 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3722 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3723 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3724 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3725 asdl_seq* targets;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3726
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3727 if (PyObject_HasAttrString(obj, "targets")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3728 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3729 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3730 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3731 tmp = PyObject_GetAttrString(obj, "targets");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3732 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3733 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3734 PyErr_Format(PyExc_TypeError, "Delete field \"targets\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3735 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3736 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3737 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3738 targets = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3739 if (targets == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3740 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3741 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3742 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3743 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3744 asdl_seq_SET(targets, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3745 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3746 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3747 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3748 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3749 PyErr_SetString(PyExc_TypeError, "required field \"targets\" missing from Delete");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3750 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3751 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3752 *out = Delete(targets, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3753 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3754 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3755 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3756 isinstance = PyObject_IsInstance(obj, (PyObject*)Assign_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3757 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3758 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3759 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3760 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3761 asdl_seq* targets;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3762 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3763
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3764 if (PyObject_HasAttrString(obj, "targets")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3765 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3766 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3767 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3768 tmp = PyObject_GetAttrString(obj, "targets");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3769 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3770 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3771 PyErr_Format(PyExc_TypeError, "Assign field \"targets\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3772 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3773 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3774 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3775 targets = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3776 if (targets == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3777 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3778 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3779 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3780 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3781 asdl_seq_SET(targets, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3782 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3783 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3784 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3785 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3786 PyErr_SetString(PyExc_TypeError, "required field \"targets\" missing from Assign");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3787 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3788 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3789 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3790 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3791 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3792 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3793 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3794 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3795 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3796 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3797 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3798 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Assign");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3799 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3800 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3801 *out = Assign(targets, value, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3802 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3803 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3804 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3805 isinstance = PyObject_IsInstance(obj, (PyObject*)AugAssign_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3806 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3807 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3808 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3809 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3810 expr_ty target;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3811 operator_ty op;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3812 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3813
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3814 if (PyObject_HasAttrString(obj, "target")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3815 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3816 tmp = PyObject_GetAttrString(obj, "target");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3817 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3818 res = obj2ast_expr(tmp, &target, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3819 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3820 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3821 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3822 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3823 PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from AugAssign");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3824 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3825 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3826 if (PyObject_HasAttrString(obj, "op")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3827 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3828 tmp = PyObject_GetAttrString(obj, "op");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3829 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3830 res = obj2ast_operator(tmp, &op, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3831 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3832 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3833 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3834 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3835 PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from AugAssign");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3836 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3837 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3838 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3839 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3840 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3841 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3842 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3843 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3844 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3845 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3846 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3847 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from AugAssign");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3848 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3849 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3850 *out = AugAssign(target, op, value, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3851 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3852 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3853 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3854 isinstance = PyObject_IsInstance(obj, (PyObject*)Print_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3855 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3856 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3857 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3858 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3859 expr_ty dest;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3860 asdl_seq* values;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3861 bool nl;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3862
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3863 if (PyObject_HasAttrString(obj, "dest")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3864 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3865 tmp = PyObject_GetAttrString(obj, "dest");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3866 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3867 res = obj2ast_expr(tmp, &dest, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3868 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3869 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3870 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3871 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3872 dest = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3873 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3874 if (PyObject_HasAttrString(obj, "values")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3875 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3876 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3877 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3878 tmp = PyObject_GetAttrString(obj, "values");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3879 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3880 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3881 PyErr_Format(PyExc_TypeError, "Print field \"values\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3882 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3883 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3884 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3885 values = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3886 if (values == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3887 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3888 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3889 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3890 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3891 asdl_seq_SET(values, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3892 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3893 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3894 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3895 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3896 PyErr_SetString(PyExc_TypeError, "required field \"values\" missing from Print");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3897 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3898 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3899 if (PyObject_HasAttrString(obj, "nl")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3900 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3901 tmp = PyObject_GetAttrString(obj, "nl");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3902 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3903 res = obj2ast_bool(tmp, &nl, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3904 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3905 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3906 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3907 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3908 PyErr_SetString(PyExc_TypeError, "required field \"nl\" missing from Print");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3909 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3910 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3911 *out = Print(dest, values, nl, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3912 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3913 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3914 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3915 isinstance = PyObject_IsInstance(obj, (PyObject*)For_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3916 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3917 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3918 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3919 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3920 expr_ty target;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3921 expr_ty iter;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3922 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3923 asdl_seq* orelse;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3924
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3925 if (PyObject_HasAttrString(obj, "target")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3926 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3927 tmp = PyObject_GetAttrString(obj, "target");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3928 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3929 res = obj2ast_expr(tmp, &target, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3930 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3931 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3932 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3933 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3934 PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from For");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3935 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3936 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3937 if (PyObject_HasAttrString(obj, "iter")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3938 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3939 tmp = PyObject_GetAttrString(obj, "iter");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3940 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3941 res = obj2ast_expr(tmp, &iter, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3942 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3943 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3944 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3945 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3946 PyErr_SetString(PyExc_TypeError, "required field \"iter\" missing from For");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3947 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3948 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3949 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3950 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3951 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3952 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3953 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3954 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3955 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3956 PyErr_Format(PyExc_TypeError, "For field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3957 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3958 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3959 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3960 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3961 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3962 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3963 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3964 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3965 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3966 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3967 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3968 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3969 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3970 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3971 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from For");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3972 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3973 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3974 if (PyObject_HasAttrString(obj, "orelse")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3975 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3976 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3977 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3978 tmp = PyObject_GetAttrString(obj, "orelse");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3979 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3980 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3981 PyErr_Format(PyExc_TypeError, "For field \"orelse\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3982 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3983 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3984 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3985 orelse = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3986 if (orelse == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3987 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3988 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3989 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3990 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3991 asdl_seq_SET(orelse, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3992 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3993 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3994 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3995 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3996 PyErr_SetString(PyExc_TypeError, "required field \"orelse\" missing from For");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3997 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3998 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3999 *out = For(target, iter, body, orelse, lineno, col_offset,
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4000 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4001 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4002 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4003 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4004 isinstance = PyObject_IsInstance(obj, (PyObject*)While_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4005 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4006 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4007 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4008 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4009 expr_ty test;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4010 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4011 asdl_seq* orelse;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4012
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4013 if (PyObject_HasAttrString(obj, "test")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4014 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4015 tmp = PyObject_GetAttrString(obj, "test");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4016 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4017 res = obj2ast_expr(tmp, &test, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4018 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4019 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4020 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4021 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4022 PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from While");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4023 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4024 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4025 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4026 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4027 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4028 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4029 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4030 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4031 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4032 PyErr_Format(PyExc_TypeError, "While field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4033 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4034 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4035 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4036 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4037 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4038 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4039 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4040 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4041 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4042 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4043 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4044 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4045 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4046 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4047 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from While");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4048 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4049 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4050 if (PyObject_HasAttrString(obj, "orelse")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4051 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4052 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4053 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4054 tmp = PyObject_GetAttrString(obj, "orelse");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4055 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4056 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4057 PyErr_Format(PyExc_TypeError, "While field \"orelse\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4058 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4059 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4060 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4061 orelse = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4062 if (orelse == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4063 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4064 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4065 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4066 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4067 asdl_seq_SET(orelse, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4068 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4069 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4070 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4071 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4072 PyErr_SetString(PyExc_TypeError, "required field \"orelse\" missing from While");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4073 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4074 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4075 *out = While(test, body, orelse, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4076 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4077 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4078 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4079 isinstance = PyObject_IsInstance(obj, (PyObject*)If_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4080 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4081 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4082 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4083 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4084 expr_ty test;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4085 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4086 asdl_seq* orelse;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4087
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4088 if (PyObject_HasAttrString(obj, "test")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4089 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4090 tmp = PyObject_GetAttrString(obj, "test");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4091 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4092 res = obj2ast_expr(tmp, &test, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4093 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4094 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4095 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4096 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4097 PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from If");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4098 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4099 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4100 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4101 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4102 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4103 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4104 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4105 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4106 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4107 PyErr_Format(PyExc_TypeError, "If field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4108 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4109 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4110 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4111 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4112 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4113 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4114 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4115 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4116 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4117 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4118 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4119 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4120 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4121 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4122 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from If");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4123 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4124 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4125 if (PyObject_HasAttrString(obj, "orelse")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4126 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4127 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4128 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4129 tmp = PyObject_GetAttrString(obj, "orelse");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4130 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4131 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4132 PyErr_Format(PyExc_TypeError, "If field \"orelse\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4133 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4134 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4135 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4136 orelse = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4137 if (orelse == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4138 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4139 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4140 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4141 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4142 asdl_seq_SET(orelse, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4143 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4144 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4145 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4146 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4147 PyErr_SetString(PyExc_TypeError, "required field \"orelse\" missing from If");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4148 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4149 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4150 *out = If(test, body, orelse, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4151 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4152 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4153 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4154 isinstance = PyObject_IsInstance(obj, (PyObject*)With_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4155 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4156 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4157 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4158 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4159 expr_ty context_expr;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4160 expr_ty optional_vars;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4161 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4162
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4163 if (PyObject_HasAttrString(obj, "context_expr")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4164 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4165 tmp = PyObject_GetAttrString(obj, "context_expr");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4166 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4167 res = obj2ast_expr(tmp, &context_expr, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4168 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4169 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4170 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4171 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4172 PyErr_SetString(PyExc_TypeError, "required field \"context_expr\" missing from With");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4173 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4174 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4175 if (PyObject_HasAttrString(obj, "optional_vars")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4176 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4177 tmp = PyObject_GetAttrString(obj, "optional_vars");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4178 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4179 res = obj2ast_expr(tmp, &optional_vars, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4180 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4181 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4182 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4183 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4184 optional_vars = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4185 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4186 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4187 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4188 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4189 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4190 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4191 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4192 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4193 PyErr_Format(PyExc_TypeError, "With field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4194 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4195 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4196 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4197 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4198 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4199 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4200 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4201 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4202 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4203 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4204 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4205 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4206 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4207 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4208 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from With");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4209 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4210 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4211 *out = With(context_expr, optional_vars, body, lineno,
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4212 col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4213 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4214 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4215 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4216 isinstance = PyObject_IsInstance(obj, (PyObject*)Raise_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4217 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4218 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4219 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4220 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4221 expr_ty type;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4222 expr_ty inst;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4223 expr_ty tback;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4224
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4225 if (PyObject_HasAttrString(obj, "type")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4226 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4227 tmp = PyObject_GetAttrString(obj, "type");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4228 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4229 res = obj2ast_expr(tmp, &type, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4230 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4231 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4232 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4233 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4234 type = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4235 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4236 if (PyObject_HasAttrString(obj, "inst")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4237 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4238 tmp = PyObject_GetAttrString(obj, "inst");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4239 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4240 res = obj2ast_expr(tmp, &inst, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4241 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4242 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4243 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4244 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4245 inst = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4246 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4247 if (PyObject_HasAttrString(obj, "tback")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4248 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4249 tmp = PyObject_GetAttrString(obj, "tback");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4250 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4251 res = obj2ast_expr(tmp, &tback, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4252 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4253 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4254 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4255 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4256 tback = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4257 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4258 *out = Raise(type, inst, tback, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4259 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4260 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4261 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4262 isinstance = PyObject_IsInstance(obj, (PyObject*)TryExcept_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4263 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4264 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4265 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4266 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4267 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4268 asdl_seq* handlers;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4269 asdl_seq* orelse;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4270
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4271 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4272 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4273 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4274 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4275 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4276 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4277 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4278 PyErr_Format(PyExc_TypeError, "TryExcept field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4279 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4280 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4281 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4282 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4283 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4284 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4285 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4286 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4287 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4288 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4289 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4290 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4291 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4292 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4293 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from TryExcept");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4294 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4295 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4296 if (PyObject_HasAttrString(obj, "handlers")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4297 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4298 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4299 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4300 tmp = PyObject_GetAttrString(obj, "handlers");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4301 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4302 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4303 PyErr_Format(PyExc_TypeError, "TryExcept field \"handlers\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4304 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4305 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4306 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4307 handlers = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4308 if (handlers == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4309 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4310 excepthandler_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4311 res = obj2ast_excepthandler(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4312 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4313 asdl_seq_SET(handlers, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4314 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4315 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4316 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4317 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4318 PyErr_SetString(PyExc_TypeError, "required field \"handlers\" missing from TryExcept");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4319 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4320 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4321 if (PyObject_HasAttrString(obj, "orelse")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4322 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4323 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4324 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4325 tmp = PyObject_GetAttrString(obj, "orelse");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4326 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4327 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4328 PyErr_Format(PyExc_TypeError, "TryExcept field \"orelse\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4329 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4330 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4331 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4332 orelse = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4333 if (orelse == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4334 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4335 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4336 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4337 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4338 asdl_seq_SET(orelse, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4339 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4340 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4341 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4342 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4343 PyErr_SetString(PyExc_TypeError, "required field \"orelse\" missing from TryExcept");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4344 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4345 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4346 *out = TryExcept(body, handlers, orelse, lineno, col_offset,
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4347 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4348 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4349 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4350 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4351 isinstance = PyObject_IsInstance(obj, (PyObject*)TryFinally_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4352 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4353 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4354 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4355 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4356 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4357 asdl_seq* finalbody;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4358
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4359 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4360 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4361 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4362 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4363 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4364 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4365 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4366 PyErr_Format(PyExc_TypeError, "TryFinally field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4367 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4368 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4369 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4370 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4371 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4372 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4373 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4374 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4375 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4376 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4377 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4378 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4379 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4380 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4381 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from TryFinally");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4382 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4383 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4384 if (PyObject_HasAttrString(obj, "finalbody")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4385 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4386 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4387 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4388 tmp = PyObject_GetAttrString(obj, "finalbody");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4389 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4390 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4391 PyErr_Format(PyExc_TypeError, "TryFinally field \"finalbody\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4392 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4393 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4394 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4395 finalbody = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4396 if (finalbody == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4397 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4398 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4399 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4400 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4401 asdl_seq_SET(finalbody, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4402 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4403 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4404 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4405 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4406 PyErr_SetString(PyExc_TypeError, "required field \"finalbody\" missing from TryFinally");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4407 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4408 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4409 *out = TryFinally(body, finalbody, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4410 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4411 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4412 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4413 isinstance = PyObject_IsInstance(obj, (PyObject*)Assert_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4414 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4415 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4416 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4417 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4418 expr_ty test;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4419 expr_ty msg;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4420
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4421 if (PyObject_HasAttrString(obj, "test")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4422 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4423 tmp = PyObject_GetAttrString(obj, "test");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4424 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4425 res = obj2ast_expr(tmp, &test, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4426 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4427 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4428 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4429 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4430 PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from Assert");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4431 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4432 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4433 if (PyObject_HasAttrString(obj, "msg")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4434 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4435 tmp = PyObject_GetAttrString(obj, "msg");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4436 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4437 res = obj2ast_expr(tmp, &msg, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4438 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4439 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4440 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4441 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4442 msg = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4443 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4444 *out = Assert(test, msg, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4445 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4446 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4447 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4448 isinstance = PyObject_IsInstance(obj, (PyObject*)Import_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4449 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4450 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4451 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4452 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4453 asdl_seq* names;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4454
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4455 if (PyObject_HasAttrString(obj, "names")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4456 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4457 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4458 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4459 tmp = PyObject_GetAttrString(obj, "names");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4460 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4461 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4462 PyErr_Format(PyExc_TypeError, "Import field \"names\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4463 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4464 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4465 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4466 names = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4467 if (names == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4468 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4469 alias_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4470 res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4471 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4472 asdl_seq_SET(names, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4473 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4474 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4475 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4476 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4477 PyErr_SetString(PyExc_TypeError, "required field \"names\" missing from Import");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4478 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4479 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4480 *out = Import(names, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4481 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4482 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4483 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4484 isinstance = PyObject_IsInstance(obj, (PyObject*)ImportFrom_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4485 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4486 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4487 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4488 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4489 identifier module;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4490 asdl_seq* names;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4491 int level;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4492
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4493 if (PyObject_HasAttrString(obj, "module")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4494 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4495 tmp = PyObject_GetAttrString(obj, "module");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4496 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4497 res = obj2ast_identifier(tmp, &module, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4498 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4499 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4500 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4501 } else {
54743 40c8c35492f1 when no module is given in a 'from' relative import, make ImportFrom.module NULL Benjamin Peterson <benjamin@python.org> parents: 49552 diff changeset	4502 module = NULL;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4503 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4504 if (PyObject_HasAttrString(obj, "names")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4505 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4506 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4507 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4508 tmp = PyObject_GetAttrString(obj, "names");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4509 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4510 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4511 PyErr_Format(PyExc_TypeError, "ImportFrom field \"names\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4512 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4513 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4514 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4515 names = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4516 if (names == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4517 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4518 alias_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4519 res = obj2ast_alias(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4520 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4521 asdl_seq_SET(names, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4522 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4523 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4524 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4525 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4526 PyErr_SetString(PyExc_TypeError, "required field \"names\" missing from ImportFrom");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4527 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4528 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4529 if (PyObject_HasAttrString(obj, "level")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4530 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4531 tmp = PyObject_GetAttrString(obj, "level");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4532 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4533 res = obj2ast_int(tmp, &level, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4534 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4535 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4536 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4537 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4538 level = 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4539 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4540 *out = ImportFrom(module, names, level, lineno, col_offset,
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4541 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4542 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4543 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4544 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4545 isinstance = PyObject_IsInstance(obj, (PyObject*)Exec_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4546 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4547 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4548 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4549 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4550 expr_ty body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4551 expr_ty globals;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4552 expr_ty locals;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4553
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4554 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4555 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4556 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4557 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4558 res = obj2ast_expr(tmp, &body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4559 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4560 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4561 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4562 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4563 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Exec");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4564 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4565 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4566 if (PyObject_HasAttrString(obj, "globals")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4567 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4568 tmp = PyObject_GetAttrString(obj, "globals");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4569 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4570 res = obj2ast_expr(tmp, &globals, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4571 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4572 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4573 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4574 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4575 globals = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4576 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4577 if (PyObject_HasAttrString(obj, "locals")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4578 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4579 tmp = PyObject_GetAttrString(obj, "locals");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4580 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4581 res = obj2ast_expr(tmp, &locals, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4582 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4583 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4584 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4585 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4586 locals = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4587 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4588 *out = Exec(body, globals, locals, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4589 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4590 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4591 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4592 isinstance = PyObject_IsInstance(obj, (PyObject*)Global_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4593 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4594 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4595 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4596 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4597 asdl_seq* names;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4598
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4599 if (PyObject_HasAttrString(obj, "names")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4600 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4601 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4602 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4603 tmp = PyObject_GetAttrString(obj, "names");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4604 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4605 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4606 PyErr_Format(PyExc_TypeError, "Global field \"names\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4607 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4608 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4609 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4610 names = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4611 if (names == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4612 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4613 identifier value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4614 res = obj2ast_identifier(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4615 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4616 asdl_seq_SET(names, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4617 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4618 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4619 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4620 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4621 PyErr_SetString(PyExc_TypeError, "required field \"names\" missing from Global");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4622 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4623 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4624 *out = Global(names, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4625 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4626 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4627 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4628 isinstance = PyObject_IsInstance(obj, (PyObject*)Expr_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4629 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4630 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4631 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4632 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4633 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4634
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4635 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4636 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4637 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4638 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4639 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4640 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4641 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4642 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4643 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4644 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Expr");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4645 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4646 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4647 *out = Expr(value, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4648 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4649 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4650 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4651 isinstance = PyObject_IsInstance(obj, (PyObject*)Pass_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4652 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4653 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4654 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4655 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4656
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4657 *out = Pass(lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4658 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4659 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4660 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4661 isinstance = PyObject_IsInstance(obj, (PyObject*)Break_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4662 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4663 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4664 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4665 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4666
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4667 *out = Break(lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4668 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4669 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4670 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4671 isinstance = PyObject_IsInstance(obj, (PyObject*)Continue_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4672 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4673 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4674 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4675 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4676
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4677 *out = Continue(lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4678 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4679 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4680 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4681
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4682 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4683 if (tmp == NULL) goto failed;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	4684 PyErr_Format(PyExc_TypeError, "expected some sort of stmt, but got %.400s", PyString_AS_STRING(tmp));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4685 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4686 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4687 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4688 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4689
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4690 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4691 obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4692 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4693 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4694 int isinstance;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4695
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4696 int lineno;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4697 int col_offset;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4698
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4699 if (obj == Py_None) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4700 *out = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4701 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4702 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4703 if (PyObject_HasAttrString(obj, "lineno")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4704 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4705 tmp = PyObject_GetAttrString(obj, "lineno");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4706 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4707 res = obj2ast_int(tmp, &lineno, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4708 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4709 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4710 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4711 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4712 PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from expr");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4713 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4714 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4715 if (PyObject_HasAttrString(obj, "col_offset")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4716 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4717 tmp = PyObject_GetAttrString(obj, "col_offset");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4718 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4719 res = obj2ast_int(tmp, &col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4720 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4721 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4722 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4723 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4724 PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from expr");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4725 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4726 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4727 isinstance = PyObject_IsInstance(obj, (PyObject*)BoolOp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4728 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4729 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4730 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4731 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4732 boolop_ty op;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4733 asdl_seq* values;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4734
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4735 if (PyObject_HasAttrString(obj, "op")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4736 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4737 tmp = PyObject_GetAttrString(obj, "op");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4738 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4739 res = obj2ast_boolop(tmp, &op, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4740 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4741 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4742 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4743 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4744 PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from BoolOp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4745 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4746 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4747 if (PyObject_HasAttrString(obj, "values")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4748 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4749 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4750 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4751 tmp = PyObject_GetAttrString(obj, "values");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4752 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4753 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4754 PyErr_Format(PyExc_TypeError, "BoolOp field \"values\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4755 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4756 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4757 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4758 values = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4759 if (values == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4760 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4761 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4762 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4763 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4764 asdl_seq_SET(values, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4765 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4766 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4767 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4768 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4769 PyErr_SetString(PyExc_TypeError, "required field \"values\" missing from BoolOp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4770 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4771 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4772 *out = BoolOp(op, values, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4773 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4774 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4775 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4776 isinstance = PyObject_IsInstance(obj, (PyObject*)BinOp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4777 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4778 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4779 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4780 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4781 expr_ty left;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4782 operator_ty op;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4783 expr_ty right;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4784
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4785 if (PyObject_HasAttrString(obj, "left")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4786 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4787 tmp = PyObject_GetAttrString(obj, "left");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4788 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4789 res = obj2ast_expr(tmp, &left, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4790 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4791 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4792 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4793 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4794 PyErr_SetString(PyExc_TypeError, "required field \"left\" missing from BinOp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4795 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4796 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4797 if (PyObject_HasAttrString(obj, "op")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4798 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4799 tmp = PyObject_GetAttrString(obj, "op");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4800 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4801 res = obj2ast_operator(tmp, &op, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4802 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4803 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4804 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4805 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4806 PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from BinOp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4807 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4808 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4809 if (PyObject_HasAttrString(obj, "right")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4810 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4811 tmp = PyObject_GetAttrString(obj, "right");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4812 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4813 res = obj2ast_expr(tmp, &right, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4814 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4815 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4816 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4817 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4818 PyErr_SetString(PyExc_TypeError, "required field \"right\" missing from BinOp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4819 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4820 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4821 *out = BinOp(left, op, right, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4822 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4823 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4824 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4825 isinstance = PyObject_IsInstance(obj, (PyObject*)UnaryOp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4826 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4827 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4828 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4829 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4830 unaryop_ty op;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4831 expr_ty operand;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4832
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4833 if (PyObject_HasAttrString(obj, "op")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4834 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4835 tmp = PyObject_GetAttrString(obj, "op");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4836 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4837 res = obj2ast_unaryop(tmp, &op, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4838 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4839 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4840 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4841 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4842 PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from UnaryOp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4843 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4844 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4845 if (PyObject_HasAttrString(obj, "operand")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4846 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4847 tmp = PyObject_GetAttrString(obj, "operand");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4848 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4849 res = obj2ast_expr(tmp, &operand, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4850 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4851 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4852 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4853 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4854 PyErr_SetString(PyExc_TypeError, "required field \"operand\" missing from UnaryOp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4855 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4856 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4857 *out = UnaryOp(op, operand, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4858 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4859 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4860 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4861 isinstance = PyObject_IsInstance(obj, (PyObject*)Lambda_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4862 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4863 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4864 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4865 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4866 arguments_ty args;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4867 expr_ty body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4868
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4869 if (PyObject_HasAttrString(obj, "args")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4870 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4871 tmp = PyObject_GetAttrString(obj, "args");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4872 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4873 res = obj2ast_arguments(tmp, &args, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4874 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4875 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4876 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4877 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4878 PyErr_SetString(PyExc_TypeError, "required field \"args\" missing from Lambda");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4879 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4880 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4881 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4882 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4883 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4884 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4885 res = obj2ast_expr(tmp, &body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4886 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4887 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4888 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4889 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4890 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Lambda");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4891 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4892 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4893 *out = Lambda(args, body, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4894 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4895 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4896 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4897 isinstance = PyObject_IsInstance(obj, (PyObject*)IfExp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4898 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4899 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4900 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4901 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4902 expr_ty test;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4903 expr_ty body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4904 expr_ty orelse;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4905
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4906 if (PyObject_HasAttrString(obj, "test")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4907 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4908 tmp = PyObject_GetAttrString(obj, "test");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4909 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4910 res = obj2ast_expr(tmp, &test, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4911 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4912 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4913 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4914 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4915 PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from IfExp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4916 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4917 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4918 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4919 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4920 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4921 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4922 res = obj2ast_expr(tmp, &body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4923 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4924 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4925 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4926 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4927 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from IfExp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4928 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4929 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4930 if (PyObject_HasAttrString(obj, "orelse")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4931 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4932 tmp = PyObject_GetAttrString(obj, "orelse");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4933 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4934 res = obj2ast_expr(tmp, &orelse, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4935 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4936 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4937 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4938 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4939 PyErr_SetString(PyExc_TypeError, "required field \"orelse\" missing from IfExp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4940 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4941 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4942 *out = IfExp(test, body, orelse, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4943 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4944 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4945 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4946 isinstance = PyObject_IsInstance(obj, (PyObject*)Dict_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4947 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4948 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4949 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4950 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4951 asdl_seq* keys;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4952 asdl_seq* values;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4953
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4954 if (PyObject_HasAttrString(obj, "keys")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4955 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4956 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4957 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4958 tmp = PyObject_GetAttrString(obj, "keys");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4959 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4960 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4961 PyErr_Format(PyExc_TypeError, "Dict field \"keys\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4962 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4963 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4964 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4965 keys = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4966 if (keys == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4967 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4968 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4969 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4970 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4971 asdl_seq_SET(keys, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4972 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4973 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4974 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4975 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4976 PyErr_SetString(PyExc_TypeError, "required field \"keys\" missing from Dict");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4977 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4978 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4979 if (PyObject_HasAttrString(obj, "values")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4980 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4981 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4982 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4983 tmp = PyObject_GetAttrString(obj, "values");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4984 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4985 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4986 PyErr_Format(PyExc_TypeError, "Dict field \"values\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4987 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4988 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4989 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4990 values = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4991 if (values == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4992 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4993 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4994 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4995 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4996 asdl_seq_SET(values, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4997 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4998 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4999 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5000 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5001 PyErr_SetString(PyExc_TypeError, "required field \"values\" missing from Dict");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5002 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5003 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5004 *out = Dict(keys, values, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5005 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5006 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5007 }
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5008 isinstance = PyObject_IsInstance(obj, (PyObject*)Set_type);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5009 if (isinstance == -1) {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5010 return 1;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5011 }
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5012 if (isinstance) {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5013 asdl_seq* elts;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5014
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5015 if (PyObject_HasAttrString(obj, "elts")) {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5016 int res;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5017 Py_ssize_t len;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5018 Py_ssize_t i;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5019 tmp = PyObject_GetAttrString(obj, "elts");
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5020 if (tmp == NULL) goto failed;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5021 if (!PyList_Check(tmp)) {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5022 PyErr_Format(PyExc_TypeError, "Set field \"elts\" must be a list, not a %.200s", tmp->ob_type->tp_name);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5023 goto failed;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5024 }
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5025 len = PyList_GET_SIZE(tmp);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5026 elts = asdl_seq_new(len, arena);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5027 if (elts == NULL) goto failed;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5028 for (i = 0; i < len; i++) {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5029 expr_ty value;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5030 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5031 if (res != 0) goto failed;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5032 asdl_seq_SET(elts, i, value);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5033 }
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5034 Py_XDECREF(tmp);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5035 tmp = NULL;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5036 } else {
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5037 PyErr_SetString(PyExc_TypeError, "required field \"elts\" missing from Set");
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5038 return 1;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5039 }
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5040 *out = Set(elts, lineno, col_offset, arena);
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5041 if (*out == NULL) goto failed;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5042 return 0;
c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	5043 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5044 isinstance = PyObject_IsInstance(obj, (PyObject*)ListComp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5045 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5046 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5047 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5048 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5049 expr_ty elt;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5050 asdl_seq* generators;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5051
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5052 if (PyObject_HasAttrString(obj, "elt")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5053 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5054 tmp = PyObject_GetAttrString(obj, "elt");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5055 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5056 res = obj2ast_expr(tmp, &elt, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5057 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5058 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5059 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5060 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5061 PyErr_SetString(PyExc_TypeError, "required field \"elt\" missing from ListComp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5062 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5063 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5064 if (PyObject_HasAttrString(obj, "generators")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5065 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5066 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5067 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5068 tmp = PyObject_GetAttrString(obj, "generators");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5069 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5070 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5071 PyErr_Format(PyExc_TypeError, "ListComp field \"generators\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5072 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5073 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5074 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5075 generators = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5076 if (generators == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5077 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5078 comprehension_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5079 res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5080 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5081 asdl_seq_SET(generators, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5082 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5083 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5084 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5085 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5086 PyErr_SetString(PyExc_TypeError, "required field \"generators\" missing from ListComp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5087 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5088 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5089 *out = ListComp(elt, generators, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5090 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5091 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5092 }
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5093 isinstance = PyObject_IsInstance(obj, (PyObject*)SetComp_type);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5094 if (isinstance == -1) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5095 return 1;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5096 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5097 if (isinstance) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5098 expr_ty elt;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5099 asdl_seq* generators;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5100
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5101 if (PyObject_HasAttrString(obj, "elt")) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5102 int res;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5103 tmp = PyObject_GetAttrString(obj, "elt");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5104 if (tmp == NULL) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5105 res = obj2ast_expr(tmp, &elt, arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5106 if (res != 0) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5107 Py_XDECREF(tmp);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5108 tmp = NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5109 } else {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5110 PyErr_SetString(PyExc_TypeError, "required field \"elt\" missing from SetComp");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5111 return 1;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5112 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5113 if (PyObject_HasAttrString(obj, "generators")) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5114 int res;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5115 Py_ssize_t len;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5116 Py_ssize_t i;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5117 tmp = PyObject_GetAttrString(obj, "generators");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5118 if (tmp == NULL) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5119 if (!PyList_Check(tmp)) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5120 PyErr_Format(PyExc_TypeError, "SetComp field \"generators\" must be a list, not a %.200s", tmp->ob_type->tp_name);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5121 goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5122 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5123 len = PyList_GET_SIZE(tmp);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5124 generators = asdl_seq_new(len, arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5125 if (generators == NULL) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5126 for (i = 0; i < len; i++) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5127 comprehension_ty value;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5128 res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5129 if (res != 0) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5130 asdl_seq_SET(generators, i, value);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5131 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5132 Py_XDECREF(tmp);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5133 tmp = NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5134 } else {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5135 PyErr_SetString(PyExc_TypeError, "required field \"generators\" missing from SetComp");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5136 return 1;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5137 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5138 *out = SetComp(elt, generators, lineno, col_offset, arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5139 if (*out == NULL) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5140 return 0;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5141 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5142 isinstance = PyObject_IsInstance(obj, (PyObject*)DictComp_type);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5143 if (isinstance == -1) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5144 return 1;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5145 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5146 if (isinstance) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5147 expr_ty key;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5148 expr_ty value;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5149 asdl_seq* generators;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5150
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5151 if (PyObject_HasAttrString(obj, "key")) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5152 int res;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5153 tmp = PyObject_GetAttrString(obj, "key");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5154 if (tmp == NULL) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5155 res = obj2ast_expr(tmp, &key, arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5156 if (res != 0) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5157 Py_XDECREF(tmp);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5158 tmp = NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5159 } else {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5160 PyErr_SetString(PyExc_TypeError, "required field \"key\" missing from DictComp");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5161 return 1;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5162 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5163 if (PyObject_HasAttrString(obj, "value")) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5164 int res;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5165 tmp = PyObject_GetAttrString(obj, "value");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5166 if (tmp == NULL) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5167 res = obj2ast_expr(tmp, &value, arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5168 if (res != 0) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5169 Py_XDECREF(tmp);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5170 tmp = NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5171 } else {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5172 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from DictComp");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5173 return 1;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5174 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5175 if (PyObject_HasAttrString(obj, "generators")) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5176 int res;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5177 Py_ssize_t len;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5178 Py_ssize_t i;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5179 tmp = PyObject_GetAttrString(obj, "generators");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5180 if (tmp == NULL) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5181 if (!PyList_Check(tmp)) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5182 PyErr_Format(PyExc_TypeError, "DictComp field \"generators\" must be a list, not a %.200s", tmp->ob_type->tp_name);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5183 goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5184 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5185 len = PyList_GET_SIZE(tmp);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5186 generators = asdl_seq_new(len, arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5187 if (generators == NULL) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5188 for (i = 0; i < len; i++) {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5189 comprehension_ty value;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5190 res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5191 if (res != 0) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5192 asdl_seq_SET(generators, i, value);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5193 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5194 Py_XDECREF(tmp);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5195 tmp = NULL;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5196 } else {
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5197 PyErr_SetString(PyExc_TypeError, "required field \"generators\" missing from DictComp");
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5198 return 1;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5199 }
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5200 *out = DictComp(key, value, generators, lineno, col_offset,
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5201 arena);
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5202 if (*out == NULL) goto failed;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5203 return 0;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	5204 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5205 isinstance = PyObject_IsInstance(obj, (PyObject*)GeneratorExp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5206 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5207 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5208 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5209 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5210 expr_ty elt;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5211 asdl_seq* generators;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5212
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5213 if (PyObject_HasAttrString(obj, "elt")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5214 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5215 tmp = PyObject_GetAttrString(obj, "elt");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5216 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5217 res = obj2ast_expr(tmp, &elt, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5218 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5219 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5220 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5221 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5222 PyErr_SetString(PyExc_TypeError, "required field \"elt\" missing from GeneratorExp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5223 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5224 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5225 if (PyObject_HasAttrString(obj, "generators")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5226 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5227 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5228 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5229 tmp = PyObject_GetAttrString(obj, "generators");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5230 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5231 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5232 PyErr_Format(PyExc_TypeError, "GeneratorExp field \"generators\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5233 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5234 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5235 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5236 generators = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5237 if (generators == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5238 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5239 comprehension_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5240 res = obj2ast_comprehension(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5241 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5242 asdl_seq_SET(generators, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5243 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5244 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5245 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5246 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5247 PyErr_SetString(PyExc_TypeError, "required field \"generators\" missing from GeneratorExp");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5248 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5249 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5250 *out = GeneratorExp(elt, generators, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5251 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5252 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5253 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5254 isinstance = PyObject_IsInstance(obj, (PyObject*)Yield_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5255 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5256 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5257 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5258 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5259 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5260
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5261 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5262 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5263 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5264 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5265 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5266 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5267 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5268 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5269 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5270 value = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5271 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5272 *out = Yield(value, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5273 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5274 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5275 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5276 isinstance = PyObject_IsInstance(obj, (PyObject*)Compare_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5277 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5278 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5279 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5280 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5281 expr_ty left;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5282 asdl_int_seq* ops;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5283 asdl_seq* comparators;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5284
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5285 if (PyObject_HasAttrString(obj, "left")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5286 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5287 tmp = PyObject_GetAttrString(obj, "left");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5288 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5289 res = obj2ast_expr(tmp, &left, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5290 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5291 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5292 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5293 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5294 PyErr_SetString(PyExc_TypeError, "required field \"left\" missing from Compare");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5295 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5296 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5297 if (PyObject_HasAttrString(obj, "ops")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5298 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5299 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5300 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5301 tmp = PyObject_GetAttrString(obj, "ops");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5302 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5303 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5304 PyErr_Format(PyExc_TypeError, "Compare field \"ops\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5305 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5306 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5307 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5308 ops = asdl_int_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5309 if (ops == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5310 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5311 cmpop_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5312 res = obj2ast_cmpop(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5313 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5314 asdl_seq_SET(ops, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5315 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5316 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5317 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5318 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5319 PyErr_SetString(PyExc_TypeError, "required field \"ops\" missing from Compare");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5320 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5321 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5322 if (PyObject_HasAttrString(obj, "comparators")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5323 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5324 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5325 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5326 tmp = PyObject_GetAttrString(obj, "comparators");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5327 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5328 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5329 PyErr_Format(PyExc_TypeError, "Compare field \"comparators\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5330 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5331 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5332 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5333 comparators = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5334 if (comparators == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5335 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5336 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5337 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5338 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5339 asdl_seq_SET(comparators, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5340 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5341 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5342 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5343 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5344 PyErr_SetString(PyExc_TypeError, "required field \"comparators\" missing from Compare");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5345 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5346 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5347 *out = Compare(left, ops, comparators, lineno, col_offset,
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5348 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5349 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5350 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5351 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5352 isinstance = PyObject_IsInstance(obj, (PyObject*)Call_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5353 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5354 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5355 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5356 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5357 expr_ty func;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5358 asdl_seq* args;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5359 asdl_seq* keywords;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5360 expr_ty starargs;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5361 expr_ty kwargs;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5362
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5363 if (PyObject_HasAttrString(obj, "func")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5364 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5365 tmp = PyObject_GetAttrString(obj, "func");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5366 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5367 res = obj2ast_expr(tmp, &func, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5368 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5369 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5370 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5371 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5372 PyErr_SetString(PyExc_TypeError, "required field \"func\" missing from Call");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5373 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5374 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5375 if (PyObject_HasAttrString(obj, "args")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5376 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5377 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5378 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5379 tmp = PyObject_GetAttrString(obj, "args");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5380 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5381 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5382 PyErr_Format(PyExc_TypeError, "Call field \"args\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5383 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5384 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5385 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5386 args = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5387 if (args == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5388 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5389 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5390 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5391 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5392 asdl_seq_SET(args, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5393 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5394 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5395 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5396 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5397 PyErr_SetString(PyExc_TypeError, "required field \"args\" missing from Call");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5398 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5399 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5400 if (PyObject_HasAttrString(obj, "keywords")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5401 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5402 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5403 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5404 tmp = PyObject_GetAttrString(obj, "keywords");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5405 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5406 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5407 PyErr_Format(PyExc_TypeError, "Call field \"keywords\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5408 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5409 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5410 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5411 keywords = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5412 if (keywords == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5413 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5414 keyword_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5415 res = obj2ast_keyword(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5416 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5417 asdl_seq_SET(keywords, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5418 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5419 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5420 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5421 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5422 PyErr_SetString(PyExc_TypeError, "required field \"keywords\" missing from Call");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5423 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5424 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5425 if (PyObject_HasAttrString(obj, "starargs")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5426 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5427 tmp = PyObject_GetAttrString(obj, "starargs");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5428 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5429 res = obj2ast_expr(tmp, &starargs, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5430 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5431 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5432 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5433 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5434 starargs = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5435 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5436 if (PyObject_HasAttrString(obj, "kwargs")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5437 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5438 tmp = PyObject_GetAttrString(obj, "kwargs");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5439 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5440 res = obj2ast_expr(tmp, &kwargs, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5441 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5442 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5443 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5444 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5445 kwargs = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5446 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5447 *out = Call(func, args, keywords, starargs, kwargs, lineno,
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5448 col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5449 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5450 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5451 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5452 isinstance = PyObject_IsInstance(obj, (PyObject*)Repr_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5453 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5454 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5455 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5456 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5457 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5458
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5459 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5460 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5461 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5462 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5463 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5464 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5465 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5466 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5467 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5468 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Repr");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5469 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5470 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5471 *out = Repr(value, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5472 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5473 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5474 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5475 isinstance = PyObject_IsInstance(obj, (PyObject*)Num_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5476 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5477 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5478 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5479 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5480 object n;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5481
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5482 if (PyObject_HasAttrString(obj, "n")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5483 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5484 tmp = PyObject_GetAttrString(obj, "n");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5485 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5486 res = obj2ast_object(tmp, &n, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5487 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5488 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5489 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5490 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5491 PyErr_SetString(PyExc_TypeError, "required field \"n\" missing from Num");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5492 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5493 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5494 *out = Num(n, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5495 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5496 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5497 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5498 isinstance = PyObject_IsInstance(obj, (PyObject*)Str_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5499 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5500 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5501 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5502 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5503 string s;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5504
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5505 if (PyObject_HasAttrString(obj, "s")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5506 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5507 tmp = PyObject_GetAttrString(obj, "s");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5508 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5509 res = obj2ast_string(tmp, &s, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5510 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5511 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5512 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5513 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5514 PyErr_SetString(PyExc_TypeError, "required field \"s\" missing from Str");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5515 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5516 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5517 *out = Str(s, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5518 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5519 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5520 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5521 isinstance = PyObject_IsInstance(obj, (PyObject*)Attribute_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5522 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5523 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5524 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5525 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5526 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5527 identifier attr;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5528 expr_context_ty ctx;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5529
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5530 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5531 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5532 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5533 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5534 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5535 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5536 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5537 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5538 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5539 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Attribute");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5540 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5541 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5542 if (PyObject_HasAttrString(obj, "attr")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5543 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5544 tmp = PyObject_GetAttrString(obj, "attr");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5545 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5546 res = obj2ast_identifier(tmp, &attr, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5547 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5548 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5549 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5550 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5551 PyErr_SetString(PyExc_TypeError, "required field \"attr\" missing from Attribute");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5552 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5553 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5554 if (PyObject_HasAttrString(obj, "ctx")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5555 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5556 tmp = PyObject_GetAttrString(obj, "ctx");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5557 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5558 res = obj2ast_expr_context(tmp, &ctx, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5559 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5560 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5561 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5562 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5563 PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Attribute");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5564 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5565 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5566 *out = Attribute(value, attr, ctx, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5567 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5568 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5569 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5570 isinstance = PyObject_IsInstance(obj, (PyObject*)Subscript_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5571 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5572 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5573 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5574 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5575 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5576 slice_ty slice;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5577 expr_context_ty ctx;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5578
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5579 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5580 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5581 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5582 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5583 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5584 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5585 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5586 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5587 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5588 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Subscript");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5589 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5590 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5591 if (PyObject_HasAttrString(obj, "slice")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5592 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5593 tmp = PyObject_GetAttrString(obj, "slice");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5594 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5595 res = obj2ast_slice(tmp, &slice, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5596 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5597 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5598 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5599 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5600 PyErr_SetString(PyExc_TypeError, "required field \"slice\" missing from Subscript");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5601 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5602 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5603 if (PyObject_HasAttrString(obj, "ctx")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5604 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5605 tmp = PyObject_GetAttrString(obj, "ctx");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5606 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5607 res = obj2ast_expr_context(tmp, &ctx, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5608 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5609 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5610 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5611 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5612 PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Subscript");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5613 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5614 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5615 *out = Subscript(value, slice, ctx, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5616 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5617 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5618 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5619 isinstance = PyObject_IsInstance(obj, (PyObject*)Name_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5620 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5621 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5622 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5623 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5624 identifier id;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5625 expr_context_ty ctx;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5626
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5627 if (PyObject_HasAttrString(obj, "id")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5628 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5629 tmp = PyObject_GetAttrString(obj, "id");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5630 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5631 res = obj2ast_identifier(tmp, &id, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5632 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5633 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5634 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5635 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5636 PyErr_SetString(PyExc_TypeError, "required field \"id\" missing from Name");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5637 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5638 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5639 if (PyObject_HasAttrString(obj, "ctx")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5640 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5641 tmp = PyObject_GetAttrString(obj, "ctx");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5642 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5643 res = obj2ast_expr_context(tmp, &ctx, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5644 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5645 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5646 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5647 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5648 PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Name");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5649 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5650 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5651 *out = Name(id, ctx, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5652 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5653 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5654 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5655 isinstance = PyObject_IsInstance(obj, (PyObject*)List_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5656 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5657 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5658 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5659 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5660 asdl_seq* elts;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5661 expr_context_ty ctx;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5662
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5663 if (PyObject_HasAttrString(obj, "elts")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5664 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5665 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5666 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5667 tmp = PyObject_GetAttrString(obj, "elts");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5668 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5669 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5670 PyErr_Format(PyExc_TypeError, "List field \"elts\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5671 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5672 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5673 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5674 elts = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5675 if (elts == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5676 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5677 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5678 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5679 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5680 asdl_seq_SET(elts, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5681 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5682 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5683 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5684 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5685 PyErr_SetString(PyExc_TypeError, "required field \"elts\" missing from List");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5686 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5687 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5688 if (PyObject_HasAttrString(obj, "ctx")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5689 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5690 tmp = PyObject_GetAttrString(obj, "ctx");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5691 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5692 res = obj2ast_expr_context(tmp, &ctx, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5693 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5694 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5695 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5696 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5697 PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from List");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5698 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5699 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5700 *out = List(elts, ctx, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5701 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5702 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5703 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5704 isinstance = PyObject_IsInstance(obj, (PyObject*)Tuple_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5705 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5706 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5707 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5708 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5709 asdl_seq* elts;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5710 expr_context_ty ctx;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5711
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5712 if (PyObject_HasAttrString(obj, "elts")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5713 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5714 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5715 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5716 tmp = PyObject_GetAttrString(obj, "elts");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5717 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5718 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5719 PyErr_Format(PyExc_TypeError, "Tuple field \"elts\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5720 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5721 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5722 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5723 elts = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5724 if (elts == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5725 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5726 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5727 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5728 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5729 asdl_seq_SET(elts, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5730 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5731 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5732 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5733 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5734 PyErr_SetString(PyExc_TypeError, "required field \"elts\" missing from Tuple");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5735 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5736 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5737 if (PyObject_HasAttrString(obj, "ctx")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5738 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5739 tmp = PyObject_GetAttrString(obj, "ctx");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5740 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5741 res = obj2ast_expr_context(tmp, &ctx, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5742 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5743 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5744 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5745 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5746 PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Tuple");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5747 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5748 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5749 *out = Tuple(elts, ctx, lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5750 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5751 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5752 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5753
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5754 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5755 if (tmp == NULL) goto failed;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	5756 PyErr_Format(PyExc_TypeError, "expected some sort of expr, but got %.400s", PyString_AS_STRING(tmp));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5757 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5758 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5759 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5760 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5761
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5762 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5763 obj2ast_expr_context(PyObject* obj, expr_context_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5764 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5765 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5766 int isinstance;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5767
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5768 isinstance = PyObject_IsInstance(obj, (PyObject *)Load_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5769 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5770 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5771 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5772 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5773 *out = Load;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5774 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5775 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5776 isinstance = PyObject_IsInstance(obj, (PyObject *)Store_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5777 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5778 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5779 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5780 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5781 *out = Store;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5782 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5783 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5784 isinstance = PyObject_IsInstance(obj, (PyObject *)Del_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5785 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5786 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5787 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5788 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5789 *out = Del;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5790 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5791 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5792 isinstance = PyObject_IsInstance(obj, (PyObject *)AugLoad_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5793 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5794 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5795 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5796 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5797 *out = AugLoad;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5798 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5799 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5800 isinstance = PyObject_IsInstance(obj, (PyObject *)AugStore_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5801 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5802 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5803 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5804 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5805 *out = AugStore;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5806 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5807 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5808 isinstance = PyObject_IsInstance(obj, (PyObject *)Param_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5809 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5810 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5811 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5812 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5813 *out = Param;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5814 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5815 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5816
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5817 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5818 if (tmp == NULL) goto failed;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	5819 PyErr_Format(PyExc_TypeError, "expected some sort of expr_context, but got %.400s", PyString_AS_STRING(tmp));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5820 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5821 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5822 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5823 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5824
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5825 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5826 obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5827 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5828 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5829 int isinstance;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5830
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5831
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5832 if (obj == Py_None) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5833 *out = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5834 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5835 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5836 isinstance = PyObject_IsInstance(obj, (PyObject*)Ellipsis_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5837 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5838 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5839 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5840 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5841
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5842 *out = Ellipsis(arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5843 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5844 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5845 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5846 isinstance = PyObject_IsInstance(obj, (PyObject*)Slice_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5847 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5848 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5849 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5850 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5851 expr_ty lower;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5852 expr_ty upper;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5853 expr_ty step;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5854
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5855 if (PyObject_HasAttrString(obj, "lower")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5856 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5857 tmp = PyObject_GetAttrString(obj, "lower");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5858 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5859 res = obj2ast_expr(tmp, &lower, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5860 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5861 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5862 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5863 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5864 lower = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5865 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5866 if (PyObject_HasAttrString(obj, "upper")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5867 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5868 tmp = PyObject_GetAttrString(obj, "upper");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5869 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5870 res = obj2ast_expr(tmp, &upper, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5871 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5872 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5873 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5874 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5875 upper = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5876 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5877 if (PyObject_HasAttrString(obj, "step")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5878 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5879 tmp = PyObject_GetAttrString(obj, "step");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5880 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5881 res = obj2ast_expr(tmp, &step, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5882 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5883 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5884 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5885 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5886 step = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5887 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5888 *out = Slice(lower, upper, step, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5889 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5890 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5891 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5892 isinstance = PyObject_IsInstance(obj, (PyObject*)ExtSlice_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5893 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5894 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5895 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5896 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5897 asdl_seq* dims;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5898
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5899 if (PyObject_HasAttrString(obj, "dims")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5900 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5901 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5902 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5903 tmp = PyObject_GetAttrString(obj, "dims");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5904 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5905 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5906 PyErr_Format(PyExc_TypeError, "ExtSlice field \"dims\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5907 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5908 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5909 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5910 dims = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5911 if (dims == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5912 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5913 slice_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5914 res = obj2ast_slice(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5915 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5916 asdl_seq_SET(dims, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5917 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5918 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5919 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5920 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5921 PyErr_SetString(PyExc_TypeError, "required field \"dims\" missing from ExtSlice");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5922 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5923 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5924 *out = ExtSlice(dims, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5925 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5926 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5927 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5928 isinstance = PyObject_IsInstance(obj, (PyObject*)Index_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5929 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5930 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5931 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5932 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5933 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5934
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5935 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5936 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5937 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5938 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5939 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5940 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5941 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5942 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5943 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5944 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Index");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5945 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5946 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5947 *out = Index(value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5948 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5949 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5950 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5951
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5952 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5953 if (tmp == NULL) goto failed;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	5954 PyErr_Format(PyExc_TypeError, "expected some sort of slice, but got %.400s", PyString_AS_STRING(tmp));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5955 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5956 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5957 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5958 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5959
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5960 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5961 obj2ast_boolop(PyObject* obj, boolop_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5962 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5963 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5964 int isinstance;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5965
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5966 isinstance = PyObject_IsInstance(obj, (PyObject *)And_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5967 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5968 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5969 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5970 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5971 *out = And;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5972 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5973 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5974 isinstance = PyObject_IsInstance(obj, (PyObject *)Or_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5975 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5976 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5977 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5978 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5979 *out = Or;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5980 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5981 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5982
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5983 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5984 if (tmp == NULL) goto failed;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	5985 PyErr_Format(PyExc_TypeError, "expected some sort of boolop, but got %.400s", PyString_AS_STRING(tmp));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5986 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5987 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5988 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5989 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5990
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5991 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5992 obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5993 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5994 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5995 int isinstance;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5996
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5997 isinstance = PyObject_IsInstance(obj, (PyObject *)Add_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5998 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5999 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6000 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6001 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6002 *out = Add;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6003 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6004 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6005 isinstance = PyObject_IsInstance(obj, (PyObject *)Sub_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6006 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6007 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6008 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6009 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6010 *out = Sub;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6011 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6012 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6013 isinstance = PyObject_IsInstance(obj, (PyObject *)Mult_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6014 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6015 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6016 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6017 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6018 *out = Mult;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6019 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6020 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6021 isinstance = PyObject_IsInstance(obj, (PyObject *)Div_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6022 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6023 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6024 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6025 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6026 *out = Div;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6027 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6028 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6029 isinstance = PyObject_IsInstance(obj, (PyObject *)Mod_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6030 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6031 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6032 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6033 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6034 *out = Mod;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6035 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6036 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6037 isinstance = PyObject_IsInstance(obj, (PyObject *)Pow_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6038 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6039 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6040 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6041 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6042 *out = Pow;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6043 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6044 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6045 isinstance = PyObject_IsInstance(obj, (PyObject *)LShift_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6046 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6047 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6048 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6049 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6050 *out = LShift;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6051 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6052 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6053 isinstance = PyObject_IsInstance(obj, (PyObject *)RShift_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6054 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6055 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6056 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6057 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6058 *out = RShift;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6059 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6060 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6061 isinstance = PyObject_IsInstance(obj, (PyObject *)BitOr_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6062 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6063 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6064 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6065 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6066 *out = BitOr;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6067 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6068 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6069 isinstance = PyObject_IsInstance(obj, (PyObject *)BitXor_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6070 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6071 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6072 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6073 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6074 *out = BitXor;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6075 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6076 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6077 isinstance = PyObject_IsInstance(obj, (PyObject *)BitAnd_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6078 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6079 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6080 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6081 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6082 *out = BitAnd;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6083 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6084 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6085 isinstance = PyObject_IsInstance(obj, (PyObject *)FloorDiv_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6086 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6087 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6088 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6089 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6090 *out = FloorDiv;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6091 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6092 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6093
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6094 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6095 if (tmp == NULL) goto failed;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	6096 PyErr_Format(PyExc_TypeError, "expected some sort of operator, but got %.400s", PyString_AS_STRING(tmp));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6097 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6098 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6099 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6100 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6101
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6102 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6103 obj2ast_unaryop(PyObject* obj, unaryop_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6104 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6105 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6106 int isinstance;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6107
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6108 isinstance = PyObject_IsInstance(obj, (PyObject *)Invert_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6109 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6110 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6111 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6112 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6113 *out = Invert;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6114 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6115 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6116 isinstance = PyObject_IsInstance(obj, (PyObject *)Not_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6117 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6118 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6119 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6120 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6121 *out = Not;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6122 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6123 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6124 isinstance = PyObject_IsInstance(obj, (PyObject *)UAdd_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6125 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6126 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6127 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6128 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6129 *out = UAdd;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6130 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6131 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6132 isinstance = PyObject_IsInstance(obj, (PyObject *)USub_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6133 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6134 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6135 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6136 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6137 *out = USub;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6138 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6139 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6140
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6141 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6142 if (tmp == NULL) goto failed;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	6143 PyErr_Format(PyExc_TypeError, "expected some sort of unaryop, but got %.400s", PyString_AS_STRING(tmp));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6144 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6145 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6146 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6147 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6148
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6149 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6150 obj2ast_cmpop(PyObject* obj, cmpop_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6151 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6152 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6153 int isinstance;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6154
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6155 isinstance = PyObject_IsInstance(obj, (PyObject *)Eq_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6156 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6157 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6158 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6159 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6160 *out = Eq;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6161 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6162 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6163 isinstance = PyObject_IsInstance(obj, (PyObject *)NotEq_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6164 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6165 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6166 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6167 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6168 *out = NotEq;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6169 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6170 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6171 isinstance = PyObject_IsInstance(obj, (PyObject *)Lt_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6172 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6173 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6174 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6175 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6176 *out = Lt;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6177 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6178 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6179 isinstance = PyObject_IsInstance(obj, (PyObject *)LtE_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6180 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6181 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6182 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6183 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6184 *out = LtE;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6185 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6186 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6187 isinstance = PyObject_IsInstance(obj, (PyObject *)Gt_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6188 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6189 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6190 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6191 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6192 *out = Gt;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6193 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6194 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6195 isinstance = PyObject_IsInstance(obj, (PyObject *)GtE_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6196 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6197 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6198 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6199 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6200 *out = GtE;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6201 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6202 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6203 isinstance = PyObject_IsInstance(obj, (PyObject *)Is_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6204 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6205 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6206 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6207 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6208 *out = Is;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6209 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6210 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6211 isinstance = PyObject_IsInstance(obj, (PyObject *)IsNot_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6212 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6213 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6214 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6215 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6216 *out = IsNot;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6217 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6218 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6219 isinstance = PyObject_IsInstance(obj, (PyObject *)In_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6220 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6221 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6222 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6223 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6224 *out = In;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6225 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6226 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6227 isinstance = PyObject_IsInstance(obj, (PyObject *)NotIn_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6228 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6229 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6230 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6231 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6232 *out = NotIn;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6233 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6234 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6235
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6236 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6237 if (tmp == NULL) goto failed;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	6238 PyErr_Format(PyExc_TypeError, "expected some sort of cmpop, but got %.400s", PyString_AS_STRING(tmp));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6239 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6240 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6241 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6242 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6243
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6244 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6245 obj2ast_comprehension(PyObject* obj, comprehension_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6246 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6247 PyObject* tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6248 expr_ty target;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6249 expr_ty iter;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6250 asdl_seq* ifs;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6251
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6252 if (PyObject_HasAttrString(obj, "target")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6253 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6254 tmp = PyObject_GetAttrString(obj, "target");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6255 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6256 res = obj2ast_expr(tmp, &target, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6257 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6258 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6259 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6260 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6261 PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from comprehension");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6262 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6263 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6264 if (PyObject_HasAttrString(obj, "iter")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6265 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6266 tmp = PyObject_GetAttrString(obj, "iter");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6267 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6268 res = obj2ast_expr(tmp, &iter, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6269 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6270 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6271 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6272 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6273 PyErr_SetString(PyExc_TypeError, "required field \"iter\" missing from comprehension");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6274 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6275 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6276 if (PyObject_HasAttrString(obj, "ifs")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6277 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6278 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6279 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6280 tmp = PyObject_GetAttrString(obj, "ifs");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6281 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6282 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6283 PyErr_Format(PyExc_TypeError, "comprehension field \"ifs\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6284 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6285 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6286 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6287 ifs = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6288 if (ifs == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6289 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6290 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6291 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6292 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6293 asdl_seq_SET(ifs, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6294 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6295 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6296 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6297 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6298 PyErr_SetString(PyExc_TypeError, "required field \"ifs\" missing from comprehension");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6299 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6300 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6301 *out = comprehension(target, iter, ifs, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6302 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6303 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6304 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6305 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6306 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6307
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6308 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6309 obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6310 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6311 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6312 int isinstance;
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6313
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6314 int lineno;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6315 int col_offset;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6316
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6317 if (obj == Py_None) {
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6318 *out = NULL;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6319 return 0;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6320 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6321 if (PyObject_HasAttrString(obj, "lineno")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6322 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6323 tmp = PyObject_GetAttrString(obj, "lineno");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6324 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6325 res = obj2ast_int(tmp, &lineno, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6326 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6327 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6328 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6329 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6330 PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from excepthandler");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6331 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6332 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6333 if (PyObject_HasAttrString(obj, "col_offset")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6334 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6335 tmp = PyObject_GetAttrString(obj, "col_offset");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6336 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6337 res = obj2ast_int(tmp, &col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6338 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6339 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6340 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6341 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6342 PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from excepthandler");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6343 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6344 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6345 isinstance = PyObject_IsInstance(obj, (PyObject*)ExceptHandler_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6346 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6347 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6348 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6349 if (isinstance) {
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6350 expr_ty type;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6351 expr_ty name;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6352 asdl_seq* body;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6353
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6354 if (PyObject_HasAttrString(obj, "type")) {
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6355 int res;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6356 tmp = PyObject_GetAttrString(obj, "type");
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6357 if (tmp == NULL) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6358 res = obj2ast_expr(tmp, &type, arena);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6359 if (res != 0) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6360 Py_XDECREF(tmp);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6361 tmp = NULL;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6362 } else {
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6363 type = NULL;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6364 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6365 if (PyObject_HasAttrString(obj, "name")) {
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6366 int res;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6367 tmp = PyObject_GetAttrString(obj, "name");
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6368 if (tmp == NULL) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6369 res = obj2ast_expr(tmp, &name, arena);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6370 if (res != 0) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6371 Py_XDECREF(tmp);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6372 tmp = NULL;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6373 } else {
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6374 name = NULL;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6375 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6376 if (PyObject_HasAttrString(obj, "body")) {
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6377 int res;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6378 Py_ssize_t len;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6379 Py_ssize_t i;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6380 tmp = PyObject_GetAttrString(obj, "body");
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6381 if (tmp == NULL) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6382 if (!PyList_Check(tmp)) {
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6383 PyErr_Format(PyExc_TypeError, "ExceptHandler field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6384 goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6385 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6386 len = PyList_GET_SIZE(tmp);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6387 body = asdl_seq_new(len, arena);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6388 if (body == NULL) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6389 for (i = 0; i < len; i++) {
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6390 stmt_ty value;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6391 res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6392 if (res != 0) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6393 asdl_seq_SET(body, i, value);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6394 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6395 Py_XDECREF(tmp);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6396 tmp = NULL;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6397 } else {
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6398 PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from ExceptHandler");
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6399 return 1;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6400 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6401 *out = ExceptHandler(type, name, body, lineno, col_offset,
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6402 arena);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6403 if (*out == NULL) goto failed;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6404 return 0;
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6405 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6406
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6407 tmp = PyObject_Repr(obj);
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6408 if (tmp == NULL) goto failed;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	6409 PyErr_Format(PyExc_TypeError, "expected some sort of excepthandler, but got %.400s", PyString_AS_STRING(tmp));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6410 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6411 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6412 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6413 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6414
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6415 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6416 obj2ast_arguments(PyObject* obj, arguments_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6417 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6418 PyObject* tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6419 asdl_seq* args;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6420 identifier vararg;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6421 identifier kwarg;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6422 asdl_seq* defaults;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6423
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6424 if (PyObject_HasAttrString(obj, "args")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6425 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6426 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6427 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6428 tmp = PyObject_GetAttrString(obj, "args");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6429 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6430 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6431 PyErr_Format(PyExc_TypeError, "arguments field \"args\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6432 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6433 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6434 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6435 args = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6436 if (args == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6437 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6438 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6439 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6440 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6441 asdl_seq_SET(args, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6442 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6443 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6444 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6445 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6446 PyErr_SetString(PyExc_TypeError, "required field \"args\" missing from arguments");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6447 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6448 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6449 if (PyObject_HasAttrString(obj, "vararg")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6450 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6451 tmp = PyObject_GetAttrString(obj, "vararg");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6452 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6453 res = obj2ast_identifier(tmp, &vararg, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6454 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6455 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6456 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6457 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6458 vararg = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6459 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6460 if (PyObject_HasAttrString(obj, "kwarg")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6461 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6462 tmp = PyObject_GetAttrString(obj, "kwarg");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6463 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6464 res = obj2ast_identifier(tmp, &kwarg, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6465 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6466 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6467 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6468 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6469 kwarg = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6470 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6471 if (PyObject_HasAttrString(obj, "defaults")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6472 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6473 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6474 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6475 tmp = PyObject_GetAttrString(obj, "defaults");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6476 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6477 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6478 PyErr_Format(PyExc_TypeError, "arguments field \"defaults\" must be a list, not a %.200s", tmp->ob_type->tp_name);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6479 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6480 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6481 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6482 defaults = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6483 if (defaults == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6484 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6485 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6486 res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6487 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6488 asdl_seq_SET(defaults, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6489 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6490 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6491 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6492 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6493 PyErr_SetString(PyExc_TypeError, "required field \"defaults\" missing from arguments");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6494 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6495 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6496 *out = arguments(args, vararg, kwarg, defaults, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6497 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6498 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6499 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6500 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6501 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6502
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6503 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6504 obj2ast_keyword(PyObject* obj, keyword_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6505 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6506 PyObject* tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6507 identifier arg;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6508 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6509
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6510 if (PyObject_HasAttrString(obj, "arg")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6511 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6512 tmp = PyObject_GetAttrString(obj, "arg");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6513 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6514 res = obj2ast_identifier(tmp, &arg, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6515 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6516 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6517 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6518 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6519 PyErr_SetString(PyExc_TypeError, "required field \"arg\" missing from keyword");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6520 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6521 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6522 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6523 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6524 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6525 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6526 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6527 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6528 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6529 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6530 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6531 PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from keyword");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6532 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6533 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6534 *out = keyword(arg, value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6535 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6536 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6537 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6538 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6539 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6540
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6541 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6542 obj2ast_alias(PyObject* obj, alias_ty* out, PyArena* arena)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6543 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6544 PyObject* tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6545 identifier name;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6546 identifier asname;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6547
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6548 if (PyObject_HasAttrString(obj, "name")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6549 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6550 tmp = PyObject_GetAttrString(obj, "name");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6551 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6552 res = obj2ast_identifier(tmp, &name, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6553 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6554 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6555 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6556 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6557 PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from alias");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6558 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6559 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6560 if (PyObject_HasAttrString(obj, "asname")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6561 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6562 tmp = PyObject_GetAttrString(obj, "asname");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6563 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6564 res = obj2ast_identifier(tmp, &asname, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6565 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6566 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6567 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6568 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6569 asname = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6570 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6571 *out = alias(name, asname, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6572 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6573 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6574 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6575 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6576 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6577
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6578
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6579 PyMODINIT_FUNC
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6580 init_ast(void)
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6581 {
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6582 PyObject m, d;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6583 if (!init_types()) return;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6584 m = Py_InitModule3("_ast", NULL, NULL);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6585 if (!m) return;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6586 d = PyModule_GetDict(m);
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	6587 if (PyDict_SetItemString(d, "AST", (PyObject*)&AST_type) < 0) return;
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6588 if (PyModule_AddIntConstant(m, "PyCF_ONLY_AST", PyCF_ONLY_AST) < 0)
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6589 return;
71463 7a72068d88fe allow None identifiers Benjamin Peterson <benjamin@python.org> parents: 71452 diff changeset	6590 if (PyModule_AddStringConstant(m, "__version__", "82160") < 0)
36707 cd847e726837 Regenerate. Martin v. Löwis <martin@v.loewis.de> parents: 36695 diff changeset	6591 return;
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6592 if (PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6593 if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6594 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6595 if (PyDict_SetItemString(d, "Interactive", (PyObject*)Interactive_type)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6596 < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6597 if (PyDict_SetItemString(d, "Expression", (PyObject*)Expression_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6598 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6599 if (PyDict_SetItemString(d, "Suite", (PyObject*)Suite_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6600 if (PyDict_SetItemString(d, "stmt", (PyObject*)stmt_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6601 if (PyDict_SetItemString(d, "FunctionDef", (PyObject*)FunctionDef_type)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6602 < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6603 if (PyDict_SetItemString(d, "ClassDef", (PyObject*)ClassDef_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6604 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6605 if (PyDict_SetItemString(d, "Return", (PyObject*)Return_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6606 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6607 if (PyDict_SetItemString(d, "Delete", (PyObject*)Delete_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6608 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6609 if (PyDict_SetItemString(d, "Assign", (PyObject*)Assign_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6610 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6611 if (PyDict_SetItemString(d, "AugAssign", (PyObject*)AugAssign_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6612 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6613 if (PyDict_SetItemString(d, "Print", (PyObject*)Print_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6614 if (PyDict_SetItemString(d, "For", (PyObject*)For_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6615 if (PyDict_SetItemString(d, "While", (PyObject*)While_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6616 if (PyDict_SetItemString(d, "If", (PyObject*)If_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6617 if (PyDict_SetItemString(d, "With", (PyObject*)With_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6618 if (PyDict_SetItemString(d, "Raise", (PyObject*)Raise_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6619 if (PyDict_SetItemString(d, "TryExcept", (PyObject*)TryExcept_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6620 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6621 if (PyDict_SetItemString(d, "TryFinally", (PyObject*)TryFinally_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6622 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6623 if (PyDict_SetItemString(d, "Assert", (PyObject*)Assert_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6624 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6625 if (PyDict_SetItemString(d, "Import", (PyObject*)Import_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6626 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6627 if (PyDict_SetItemString(d, "ImportFrom", (PyObject*)ImportFrom_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6628 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6629 if (PyDict_SetItemString(d, "Exec", (PyObject*)Exec_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6630 if (PyDict_SetItemString(d, "Global", (PyObject*)Global_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6631 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6632 if (PyDict_SetItemString(d, "Expr", (PyObject*)Expr_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6633 if (PyDict_SetItemString(d, "Pass", (PyObject*)Pass_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6634 if (PyDict_SetItemString(d, "Break", (PyObject*)Break_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6635 if (PyDict_SetItemString(d, "Continue", (PyObject*)Continue_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6636 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6637 if (PyDict_SetItemString(d, "expr", (PyObject*)expr_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6638 if (PyDict_SetItemString(d, "BoolOp", (PyObject*)BoolOp_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6639 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6640 if (PyDict_SetItemString(d, "BinOp", (PyObject*)BinOp_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6641 if (PyDict_SetItemString(d, "UnaryOp", (PyObject*)UnaryOp_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6642 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6643 if (PyDict_SetItemString(d, "Lambda", (PyObject*)Lambda_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6644 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6645 if (PyDict_SetItemString(d, "IfExp", (PyObject*)IfExp_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6646 if (PyDict_SetItemString(d, "Dict", (PyObject*)Dict_type) < 0) return;
58229 c2fdf25329ff Issue #2335: Backport set literals syntax from Python 3.x. Alexandre Vassalotti <alexandre@peadrop.com> parents: 57673 diff changeset	6647 if (PyDict_SetItemString(d, "Set", (PyObject*)Set_type) < 0) return;
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6648 if (PyDict_SetItemString(d, "ListComp", (PyObject*)ListComp_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6649 return;
58250 edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	6650 if (PyDict_SetItemString(d, "SetComp", (PyObject*)SetComp_type) < 0)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	6651 return;
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	6652 if (PyDict_SetItemString(d, "DictComp", (PyObject*)DictComp_type) < 0)
edfed0e32ced Issue #2333: Backport set and dict comprehensions syntax. Alexandre Vassalotti <alexandre@peadrop.com> parents: 58230 diff changeset	6653 return;
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6654 if (PyDict_SetItemString(d, "GeneratorExp",
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6655 (PyObject*)GeneratorExp_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6656 if (PyDict_SetItemString(d, "Yield", (PyObject*)Yield_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6657 if (PyDict_SetItemString(d, "Compare", (PyObject*)Compare_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6658 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6659 if (PyDict_SetItemString(d, "Call", (PyObject*)Call_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6660 if (PyDict_SetItemString(d, "Repr", (PyObject*)Repr_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6661 if (PyDict_SetItemString(d, "Num", (PyObject*)Num_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6662 if (PyDict_SetItemString(d, "Str", (PyObject*)Str_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6663 if (PyDict_SetItemString(d, "Attribute", (PyObject*)Attribute_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6664 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6665 if (PyDict_SetItemString(d, "Subscript", (PyObject*)Subscript_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6666 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6667 if (PyDict_SetItemString(d, "Name", (PyObject*)Name_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6668 if (PyDict_SetItemString(d, "List", (PyObject*)List_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6669 if (PyDict_SetItemString(d, "Tuple", (PyObject*)Tuple_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6670 if (PyDict_SetItemString(d, "expr_context",
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6671 (PyObject*)expr_context_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6672 if (PyDict_SetItemString(d, "Load", (PyObject*)Load_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6673 if (PyDict_SetItemString(d, "Store", (PyObject*)Store_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6674 if (PyDict_SetItemString(d, "Del", (PyObject*)Del_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6675 if (PyDict_SetItemString(d, "AugLoad", (PyObject*)AugLoad_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6676 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6677 if (PyDict_SetItemString(d, "AugStore", (PyObject*)AugStore_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6678 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6679 if (PyDict_SetItemString(d, "Param", (PyObject*)Param_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6680 if (PyDict_SetItemString(d, "slice", (PyObject*)slice_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6681 if (PyDict_SetItemString(d, "Ellipsis", (PyObject*)Ellipsis_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6682 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6683 if (PyDict_SetItemString(d, "Slice", (PyObject*)Slice_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6684 if (PyDict_SetItemString(d, "ExtSlice", (PyObject*)ExtSlice_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6685 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6686 if (PyDict_SetItemString(d, "Index", (PyObject*)Index_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6687 if (PyDict_SetItemString(d, "boolop", (PyObject*)boolop_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6688 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6689 if (PyDict_SetItemString(d, "And", (PyObject*)And_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6690 if (PyDict_SetItemString(d, "Or", (PyObject*)Or_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6691 if (PyDict_SetItemString(d, "operator", (PyObject*)operator_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6692 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6693 if (PyDict_SetItemString(d, "Add", (PyObject*)Add_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6694 if (PyDict_SetItemString(d, "Sub", (PyObject*)Sub_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6695 if (PyDict_SetItemString(d, "Mult", (PyObject*)Mult_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6696 if (PyDict_SetItemString(d, "Div", (PyObject*)Div_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6697 if (PyDict_SetItemString(d, "Mod", (PyObject*)Mod_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6698 if (PyDict_SetItemString(d, "Pow", (PyObject*)Pow_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6699 if (PyDict_SetItemString(d, "LShift", (PyObject*)LShift_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6700 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6701 if (PyDict_SetItemString(d, "RShift", (PyObject*)RShift_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6702 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6703 if (PyDict_SetItemString(d, "BitOr", (PyObject*)BitOr_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6704 if (PyDict_SetItemString(d, "BitXor", (PyObject*)BitXor_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6705 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6706 if (PyDict_SetItemString(d, "BitAnd", (PyObject*)BitAnd_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6707 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6708 if (PyDict_SetItemString(d, "FloorDiv", (PyObject*)FloorDiv_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6709 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6710 if (PyDict_SetItemString(d, "unaryop", (PyObject*)unaryop_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6711 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6712 if (PyDict_SetItemString(d, "Invert", (PyObject*)Invert_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6713 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6714 if (PyDict_SetItemString(d, "Not", (PyObject*)Not_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6715 if (PyDict_SetItemString(d, "UAdd", (PyObject*)UAdd_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6716 if (PyDict_SetItemString(d, "USub", (PyObject*)USub_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6717 if (PyDict_SetItemString(d, "cmpop", (PyObject*)cmpop_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6718 if (PyDict_SetItemString(d, "Eq", (PyObject*)Eq_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6719 if (PyDict_SetItemString(d, "NotEq", (PyObject*)NotEq_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6720 if (PyDict_SetItemString(d, "Lt", (PyObject*)Lt_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6721 if (PyDict_SetItemString(d, "LtE", (PyObject*)LtE_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6722 if (PyDict_SetItemString(d, "Gt", (PyObject*)Gt_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6723 if (PyDict_SetItemString(d, "GtE", (PyObject*)GtE_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6724 if (PyDict_SetItemString(d, "Is", (PyObject*)Is_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6725 if (PyDict_SetItemString(d, "IsNot", (PyObject*)IsNot_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6726 if (PyDict_SetItemString(d, "In", (PyObject*)In_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6727 if (PyDict_SetItemString(d, "NotIn", (PyObject*)NotIn_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6728 if (PyDict_SetItemString(d, "comprehension",
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6729 (PyObject*)comprehension_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6730 if (PyDict_SetItemString(d, "excepthandler",
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6731 (PyObject*)excepthandler_type) < 0) return;
46200 2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6732 if (PyDict_SetItemString(d, "ExceptHandler",
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6733 (PyObject*)ExceptHandler_type) < 0) return;
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6734 if (PyDict_SetItemString(d, "arguments", (PyObject*)arguments_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6735 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6736 if (PyDict_SetItemString(d, "keyword", (PyObject*)keyword_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6737 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6738 if (PyDict_SetItemString(d, "alias", (PyObject*)alias_type) < 0) return;
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6739 }
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6740
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6741
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	6742 PyObject* PyAST_mod2obj(mod_ty t)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6743 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	6744 init_types();
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	6745 return ast2obj_mod(t);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6746 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6747
46193 b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6748 /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */
b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6749 mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6750 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6751 mod_ty res;
46193 b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6752 PyObject req_type[] = {(PyObject)Module_type, (PyObject*)Expression_type,
b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6753 (PyObject*)Interactive_type};
b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6754 char *req_name[] = {"Module", "Expression", "Interactive"};
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6755 int isinstance;
46193 b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6756 assert(0 <= mode && mode <= 2);
b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6757
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6758 init_types();
46193 b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6759
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6760 isinstance = PyObject_IsInstance(ast, req_type[mode]);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6761 if (isinstance == -1)
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6762 return NULL;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6763 if (!isinstance) {
46193 b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6764 PyErr_Format(PyExc_TypeError, "expected %s node, got %.400s",
b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6765 req_name[mode], Py_TYPE(ast)->tp_name);
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6766 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6767 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6768 if (obj2ast_mod(ast, &res, arena) != 0)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6769 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6770 else
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6771 return res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6772 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6773
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6774 int PyAST_Check(PyObject* obj)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6775 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6776 init_types();
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	6777 return PyObject_IsInstance(obj, (PyObject*)&AST_type);
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6778 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6779
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6780

Mercurial > cpython-lru_cache-weakref

annotate Python/Python-ast.c @ 78855:5a2ef447b80d 2.7