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

annotate Python/Python-ast.c @ 61774:55e2368f72f2 2.6

Merged revisions 81380 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81380 | brett.cannon | 2010-05-20 11:37:55 -0700 (Thu, 20 May 2010) | 8 lines Turned out that if you used explicit relative import syntax (e.g. from .os import sep) and it failed, import would still try the implicit relative import semantics of an absolute import (from os import sep). That's not right, so when level is negative, only do explicit relative import semantics. Fixes issue #7902. Thanks to Meador Inge for the patch. ........

author	Brett Cannon <bcannon@gmail.com>
date	Thu, 20 May 2010 18:41:08 +0000
parents	2b934d466993
children	86fa95c560a6 b36cb4602e21

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 /*
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	5 __version__ 62047.
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 };
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	191 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	192 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	193 "elt",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	194 "generators",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	195 };
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	196 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	197 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	198 "elt",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	199 "generators",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	200 };
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	201 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	202 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	203 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	204 };
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	205 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	206 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	207 "left",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	208 "ops",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	209 "comparators",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 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 *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	212 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	213 "func",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	214 "args",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	215 "keywords",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	216 "starargs",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	217 "kwargs",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	218 };
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	219 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	220 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	221 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	222 };
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	223 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	224 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	225 "n",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	226 };
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	227 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	228 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	229 "s",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	230 };
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	231 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	232 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	233 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	234 "attr",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	235 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	236 };
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	237 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	238 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	239 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	240 "slice",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	241 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	242 };
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	243 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	244 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	245 "id",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	246 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	247 };
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	248 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	249 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	250 "elts",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	251 "ctx",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	252 };
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	253 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	254 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	255 "elts",
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 *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	259 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	260 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	261 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	262 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	263 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	264 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	265 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	266 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	267 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	268 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	269 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	270 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	271 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	272 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	273 "lower",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	274 "upper",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	275 "step",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	276 };
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 *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	278 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	279 "dims",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	280 };
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	281 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	282 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	283 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	284 };
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 *boolop_type;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	286 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	287 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	288 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	289 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	290 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	291 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	292 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	293 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	294 *FloorDiv_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	295 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	296 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	297 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	298 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	299 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	300 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	301 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	302 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	303 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	304 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	305 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	306 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	307 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	308 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	309 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	310 *USub_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	311 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	312 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	313 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	314 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	315 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	316 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	317 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	318 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	319 *NotIn_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	320 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	321 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	322 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	323 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	324 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	325 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	326 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	327 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	328 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	329 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	330 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	331 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	332 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	333 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	334 "target",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	335 "iter",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	336 "ifs",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	337 };
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	338 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	339 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	340 "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	341 "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	342 };
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	343 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	344 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	345 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	346 "type",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	347 "name",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	348 "body",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	349 };
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	350 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	351 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	352 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	353 "args",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	354 "vararg",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	355 "kwarg",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	356 "defaults",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	357 };
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	358 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	359 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	360 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	361 "arg",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	362 "value",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	363 };
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	364 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	365 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	366 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	367 "name",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	368 "asname",
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	369 };
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	370
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	371
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	372 static int
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	373 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	374 {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	375 Py_ssize_t i, numfields = 0;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	376 int res = -1;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	377 PyObject key, value, *fields;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	378 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	379 if (!fields)
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	380 PyErr_Clear();
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	381 if (fields) {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	382 numfields = PySequence_Size(fields);
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	383 if (numfields == -1)
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	384 goto cleanup;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	385 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	386 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	387 if (PyTuple_GET_SIZE(args) > 0) {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	388 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	389 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	390 "%zd positional argument%s",
46207 59d42e6d1885 Fix error message -- "expects either 0 or 0 arguments" Georg Brandl <georg@python.org> parents: 46204 diff changeset	391 Py_TYPE(self)->tp_name,
59d42e6d1885 Fix error message -- "expects either 0 or 0 arguments" Georg Brandl <georg@python.org> parents: 46204 diff changeset	392 numfields == 0 ? "" : "either 0 or ",
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	393 numfields, numfields == 1 ? "" : "s");
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	394 res = -1;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	395 goto cleanup;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	396 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	397 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	398 /* cannot be reached when fields is NULL */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	399 PyObject *name = PySequence_GetItem(fields, i);
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	400 if (!name) {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	401 res = -1;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	402 goto cleanup;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	403 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	404 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	405 Py_DECREF(name);
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	406 if (res < 0)
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	407 goto cleanup;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	408 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	409 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	410 if (kw) {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	411 i = 0; /* needed by PyDict_Next */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	412 while (PyDict_Next(kw, &i, &key, &value)) {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	413 res = PyObject_SetAttr(self, key, value);
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	414 if (res < 0)
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	415 goto cleanup;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	416 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	417 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	418 cleanup:
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	419 Py_XDECREF(fields);
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	420 return res;
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	421 }
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	422
46212 be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	423 /* Pickling support */
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	424 static PyObject *
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	425 ast_type_reduce(PyObject self, PyObject unused)
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	426 {
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	427 PyObject *res;
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	428 PyObject *dict = PyObject_GetAttrString(self, "__dict__");
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	429 if (dict == NULL) {
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	430 if (PyErr_ExceptionMatches(PyExc_AttributeError))
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	431 PyErr_Clear();
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	432 else
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	433 return NULL;
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	434 }
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	435 if (dict) {
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	436 res = Py_BuildValue("O()O", Py_TYPE(self), dict);
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	437 Py_DECREF(dict);
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	438 return res;
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	439 }
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	440 return Py_BuildValue("O()", Py_TYPE(self));
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
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	443 static PyMethodDef ast_type_methods[] = {
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	444 {"__reduce__", ast_type_reduce, METH_NOARGS, NULL},
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	445 {NULL}
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	446 };
be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	447
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	448 static PyTypeObject AST_type = {
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	449 PyVarObject_HEAD_INIT(&PyType_Type, 0)
46212 be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	450 "_ast.AST",
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	451 sizeof(PyObject),
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	452 0,
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	453 0, /* tp_dealloc */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	454 0, /* tp_print */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	455 0, /* tp_getattr */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	456 0, /* tp_setattr */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	457 0, /* tp_compare */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	458 0, /* tp_repr */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	459 0, /* tp_as_number */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	460 0, /* tp_as_sequence */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	461 0, /* tp_as_mapping */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	462 0, /* tp_hash */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	463 0, /* tp_call */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	464 0, /* tp_str */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	465 PyObject_GenericGetAttr, /* tp_getattro */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	466 PyObject_GenericSetAttr, /* tp_setattro */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	467 0, /* tp_as_buffer */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	468 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	469 0, /* tp_doc */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	470 0, /* tp_traverse */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	471 0, /* tp_clear */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	472 0, /* tp_richcompare */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	473 0, /* tp_weaklistoffset */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	474 0, /* tp_iter */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	475 0, /* tp_iternext */
46212 be18df634405 Make AST nodes pickleable. Georg Brandl <georg@python.org> parents: 46207 diff changeset	476 ast_type_methods, /* tp_methods */
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	477 0, /* tp_members */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	478 0, /* tp_getset */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	479 0, /* tp_base */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	480 0, /* tp_dict */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	481 0, /* tp_descr_get */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	482 0, /* tp_descr_set */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	483 0, /* tp_dictoffset */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	484 (initproc)ast_type_init, /* tp_init */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	485 PyType_GenericAlloc, /* tp_alloc */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	486 PyType_GenericNew, /* tp_new */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	487 PyObject_Del, /* tp_free */
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	488 };
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	489
42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	490
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	491 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	492 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	493 PyObject fnames, result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	494 int i;
46204 29ea507fd998 Make _fields attr for no fields consistent with _attributes attr. Georg Brandl <georg@python.org> parents: 46202 diff changeset	495 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	496 if (!fnames) return NULL;
29ea507fd998 Make _fields attr for no fields consistent with _attributes attr. Georg Brandl <georg@python.org> parents: 46202 diff changeset	497 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	498 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	499 if (!field) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	500 Py_DECREF(fnames);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	501 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	502 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	503 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	504 }
36726 bbf16fd024df from __future__ import with_statement addon for 'with', mostly written by Thomas Wouters <thomas@python.org> parents: 36712 diff changeset	505 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	506 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	507 Py_DECREF(fnames);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	508 return (PyTypeObject*)result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	509 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	510
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	511 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	512 {
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	513 int i, result;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	514 PyObject s, l = PyTuple_New(num_fields);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	515 if (!l) return 0;
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	516 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	517 s = PyString_FromString(attrs[i]);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	518 if (!s) {
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	519 Py_DECREF(l);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	520 return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	521 }
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	522 PyTuple_SET_ITEM(l, i, s);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	523 }
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	524 result = PyObject_SetAttrString((PyObject*)type, "_attributes", l) >= 0;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	525 Py_DECREF(l);
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	526 return result;
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	527 }
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	528
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	529 /* Conversion AST -> Python */
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	530
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	531 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	532 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	533 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	534 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	535 PyObject *value;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	536 if (!result)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	537 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	538 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	539 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	540 if (!value) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	541 Py_DECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	542 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	543 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	544 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	545 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	546 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	547 }
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 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	550 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	551 if (!o)
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	552 o = Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	553 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	554 return (PyObject*)o;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	555 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	556 #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	557 #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	558 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	559 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	560 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	561 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	562
40936 0376f13a1af9 Fix a couple of problems in generating the AST code: Neal Norwitz <nnorwitz@gmail.com> parents: 40824 diff changeset	563 static PyObject* ast2obj_int(long b)
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	564 {
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	565 return PyInt_FromLong(b);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	566 }
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	567
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	568 /* Conversion Python -> AST */
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	569
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	570 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	571 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	572 if (obj == Py_None)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	573 obj = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	574 if (obj)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	575 PyArena_AddPyObject(arena, obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	576 Py_XINCREF(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	577 *out = obj;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	578 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	579 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	580
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	581 #define obj2ast_identifier obj2ast_object
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	582 #define obj2ast_string obj2ast_object
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	583
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	584 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	585 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	586 int i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	587 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	588 PyObject *s = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	589 if (s == NULL) return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	590 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	591 PyString_AS_STRING(s));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	592 Py_DECREF(s);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	593 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	594 }
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 i = (int)PyLong_AsLong(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	597 if (i == -1 && PyErr_Occurred())
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	598 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	599 *out = i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	600 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	601 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	602
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	603 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	604 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	605 if (!PyBool_Check(obj)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	606 PyObject *s = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	607 if (s == NULL) return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	608 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	609 PyString_AS_STRING(s));
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	610 Py_DECREF(s);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	611 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	612 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	613
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	614 *out = (obj == Py_True);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	615 return 0;
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
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	618 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	619 {
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	620 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	621 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	622 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	623 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	624 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	625 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	626 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	627 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	628 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	629 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	630 }
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	631 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	632 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	633 }
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	634
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	635
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	636 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	637 {
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	638 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	639 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	640 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	641 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	642 if (!mod_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	643 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	644 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	645 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	646 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	647 Interactive_fields, 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	648 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	649 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	650 1);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	651 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	652 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	653 if (!Suite_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	654 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	655 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	656 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	657 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	658 FunctionDef_fields, 4);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	659 if (!FunctionDef_type) return 0;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	660 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	661 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	662 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	663 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	664 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	665 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	666 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	667 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	668 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	669 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	670 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	671 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	672 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	673 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	674 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	675 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	676 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	677 if (!If_type) return 0;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	678 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	679 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	680 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	681 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	682 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	683 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	684 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	685 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	686 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	687 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	688 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	689 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	690 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	691 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	692 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	693 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	694 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	695 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	696 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	697 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	698 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	699 if (!Expr_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	700 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	701 if (!Pass_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	702 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	703 if (!Break_type) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	704 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	705 if (!Continue_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	706 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	707 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	708 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	709 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	710 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	711 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	712 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	713 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	714 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	715 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	716 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	717 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	718 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	719 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	720 if (!Dict_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	721 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	722 if (!ListComp_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	723 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	724 GeneratorExp_fields, 2);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	725 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	726 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	727 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	728 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	729 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	730 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	731 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	732 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	733 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	734 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	735 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	736 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	737 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	738 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	739 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	740 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	741 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	742 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	743 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	744 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	745 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	746 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	747 if (!Tuple_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	748 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	749 if (!expr_context_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	750 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	751 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	752 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	753 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	754 if (!Load_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	755 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	756 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	757 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	758 if (!Store_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	759 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	760 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	761 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	762 if (!Del_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	763 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	764 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	765 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	766 if (!AugLoad_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	767 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	768 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	769 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	770 if (!AugStore_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	771 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	772 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	773 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	774 if (!Param_singleton) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	775 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	776 if (!slice_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	777 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	778 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	779 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	780 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	781 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	782 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	783 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	784 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	785 if (!Index_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	786 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	787 if (!boolop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	788 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	789 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	790 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	791 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	792 if (!And_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	793 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	794 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	795 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	796 if (!Or_singleton) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	797 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	798 if (!operator_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	799 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	800 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	801 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	802 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	803 if (!Add_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	804 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	805 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	806 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	807 if (!Sub_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	808 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	809 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	810 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	811 if (!Mult_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	812 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	813 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	814 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	815 if (!Div_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	816 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	817 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	818 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	819 if (!Mod_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	820 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	821 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	822 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	823 if (!Pow_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	824 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	825 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	826 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	827 if (!LShift_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	828 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	829 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	830 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	831 if (!RShift_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	832 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	833 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	834 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	835 if (!BitOr_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	836 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	837 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	838 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	839 if (!BitXor_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	840 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	841 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	842 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	843 if (!BitAnd_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	844 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	845 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	846 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	847 if (!FloorDiv_singleton) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	848 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	849 if (!unaryop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	850 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	851 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	852 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	853 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	854 if (!Invert_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	855 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	856 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	857 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	858 if (!Not_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	859 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	860 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	861 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	862 if (!UAdd_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	863 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	864 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	865 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	866 if (!USub_singleton) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	867 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	868 if (!cmpop_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	869 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	870 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	871 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	872 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	873 if (!Eq_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	874 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	875 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	876 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	877 if (!NotEq_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	878 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	879 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	880 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	881 if (!Lt_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	882 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	883 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	884 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	885 if (!LtE_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	886 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	887 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	888 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	889 if (!Gt_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	890 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	891 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	892 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	893 if (!GtE_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	894 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	895 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	896 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	897 if (!Is_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	898 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	899 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	900 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	901 if (!IsNot_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	902 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	903 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	904 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	905 if (!In_singleton) return 0;
36664 7bfbfb2ef4e2 Stop generating empty arrays. Martin v. Löwis <martin@v.loewis.de> parents: 36661 diff changeset	906 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	907 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	908 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	909 if (!NotIn_singleton) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	910 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	911 comprehension_fields, 3);
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	912 if (!comprehension_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	913 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	914 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	915 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	916 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	917 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	918 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	919 if (!ExceptHandler_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	920 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	921 if (!arguments_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	922 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	923 if (!keyword_type) return 0;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	924 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	925 if (!alias_type) return 0;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	926 initialized = 1;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	927 return 1;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	928 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	929
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	930 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	931 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	932 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	933 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	934 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	935 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	936 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	937 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	938 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	939 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	940 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	941 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	942 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	943 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	944 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	945 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	946 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	947
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	948 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	949 Module(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	950 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	951 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	952 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	953 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	954 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	955 p->kind = Module_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	956 p->v.Module.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	957 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	958 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	959
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	960 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	961 Interactive(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	962 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	963 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	964 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	965 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	966 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	967 p->kind = Interactive_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	968 p->v.Interactive.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	969 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	970 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	971
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	972 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	973 Expression(expr_ty body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	974 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	975 mod_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	976 if (!body) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	977 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	978 "field body is required for Expression");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	979 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	980 }
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	981 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	982 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	983 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	984 p->kind = Expression_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	985 p->v.Expression.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	986 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	987 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	988
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	989 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	990 Suite(asdl_seq * body, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	991 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	992 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	993 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	994 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	995 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	996 p->kind = Suite_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	997 p->v.Suite.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	998 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	999 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1000
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1001 stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1002 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	1003 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	1004 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1005 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1006 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1007 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1008 "field name is required for FunctionDef");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1009 return NULL;
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 if (!args) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1012 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1013 "field args is required for FunctionDef");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1014 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1015 }
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	1016 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	1017 if (!p)
35742 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 p->kind = FunctionDef_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1020 p->v.FunctionDef.name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1021 p->v.FunctionDef.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1022 p->v.FunctionDef.body = body;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	1023 p->v.FunctionDef.decorator_list = decorator_list;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1024 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	1025 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1026 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1029 stmt_ty
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	1030 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	1031 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	1032 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1033 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1034 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1035 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1036 "field name is required for ClassDef");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1037 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1038 }
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	1039 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	1040 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1041 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1042 p->kind = ClassDef_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1043 p->v.ClassDef.name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1044 p->v.ClassDef.bases = bases;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1045 p->v.ClassDef.body = body;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	1046 p->v.ClassDef.decorator_list = decorator_list;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1047 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	1048 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1049 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1050 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1051
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1052 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	1053 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	1054 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1055 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	1056 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	1057 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1058 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1059 p->kind = Return_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1060 p->v.Return.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1061 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	1062 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1063 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1064 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1065
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1066 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	1067 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	1068 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1069 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	1070 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	1071 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1072 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1073 p->kind = Delete_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1074 p->v.Delete.targets = targets;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1075 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	1076 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1077 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1078 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1079
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1080 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	1081 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	1082 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1083 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1084 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1085 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1086 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1087 "field value is required for Assign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1088 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1089 }
36065 ea083efdc96c Merge from ast-arena. This reduces the code in Python/ast.c by ~300 lines, Neal Norwitz <nnorwitz@gmail.com> parents: 36003 diff changeset	1090 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	1091 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1092 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1093 p->kind = Assign_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1094 p->v.Assign.targets = targets;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1095 p->v.Assign.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1096 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	1097 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1098 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1099 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1100
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1101 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	1102 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	1103 col_offset, PyArena *arena)
35742 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 p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1106 if (!target) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1107 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1108 "field target is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1109 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1110 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1111 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1112 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1113 "field op is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1114 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1115 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1116 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1117 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1118 "field value is required for AugAssign");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1119 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1120 }
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	1121 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	1122 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1123 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1124 p->kind = AugAssign_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1125 p->v.AugAssign.target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1126 p->v.AugAssign.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1127 p->v.AugAssign.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1128 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	1129 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1130 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1131 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1132
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1133 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	1134 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	1135 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1136 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1137 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	1138 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	1139 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1140 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1141 p->kind = Print_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1142 p->v.Print.dest = dest;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1143 p->v.Print.values = values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1144 p->v.Print.nl = nl;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1145 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	1146 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1147 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1148 }
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 stmt_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1151 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	1152 lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1153 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1154 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1155 if (!target) {
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 target is required for For");
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 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1160 if (!iter) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1161 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1162 "field iter is required for For");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1163 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1164 }
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	1165 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	1166 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1167 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1168 p->kind = For_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1169 p->v.For.target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1170 p->v.For.iter = iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1171 p->v.For.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1172 p->v.For.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1173 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	1174 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1175 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1176 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1177
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1178 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	1179 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	1180 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1181 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1182 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1183 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1184 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1185 "field test is required for While");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1186 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1187 }
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	1188 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	1189 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1190 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1191 p->kind = While_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1192 p->v.While.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1193 p->v.While.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1194 p->v.While.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1195 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	1196 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1197 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1200 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	1201 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	1202 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1203 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1204 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1205 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1206 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1207 "field test is required for If");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1208 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1209 }
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	1210 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	1211 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1212 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1213 p->kind = If_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1214 p->v.If.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1215 p->v.If.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1216 p->v.If.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1217 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	1218 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1219 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1222 stmt_ty
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1223 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	1224 int col_offset, PyArena *arena)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1225 {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1226 stmt_ty p;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1227 if (!context_expr) {
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1228 PyErr_SetString(PyExc_ValueError,
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1229 "field context_expr is required for With");
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1230 return NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1231 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1232 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	1233 if (!p)
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1234 return NULL;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1235 p->kind = With_kind;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1236 p->v.With.context_expr = context_expr;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1237 p->v.With.optional_vars = optional_vars;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1238 p->v.With.body = body;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1239 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	1240 p->col_offset = col_offset;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1241 return p;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1242 }
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1243
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	1244 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	1245 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	1246 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1247 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1248 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	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 = Raise_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1253 p->v.Raise.type = type;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1254 p->v.Raise.inst = inst;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1255 p->v.Raise.tback = tback;
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
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	1262 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	1263 int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1264 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1265 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	1266 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	1267 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1268 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1269 p->kind = TryExcept_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1270 p->v.TryExcept.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1271 p->v.TryExcept.handlers = handlers;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1272 p->v.TryExcept.orelse = orelse;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1273 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	1274 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1275 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1276 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1277
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1278 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	1279 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	1280 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1281 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1282 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	1283 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	1284 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1285 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1286 p->kind = TryFinally_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1287 p->v.TryFinally.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1288 p->v.TryFinally.finalbody = finalbody;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1289 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	1290 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1291 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1292 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1293
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1294 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	1295 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	1296 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1297 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1298 if (!test) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1299 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1300 "field test is required for Assert");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1301 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1302 }
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	1303 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	1304 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1305 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1306 p->kind = Assert_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1307 p->v.Assert.test = test;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1308 p->v.Assert.msg = msg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1309 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	1310 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1311 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1312 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1313
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1314 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	1315 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	1316 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1317 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	1318 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	1319 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1320 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1321 p->kind = Import_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1322 p->v.Import.names = names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1323 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	1324 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1325 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1326 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1327
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1328 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	1329 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	1330 col_offset, PyArena *arena)
35742 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 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1333 if (!module) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1334 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1335 "field module is required for ImportFrom");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1336 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1337 }
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	1338 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	1339 if (!p)
35742 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 p->kind = ImportFrom_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1342 p->v.ImportFrom.module = module;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1343 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	1344 p->v.ImportFrom.level = level;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1345 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	1346 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1347 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1348 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1349
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1350 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	1351 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	1352 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1353 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1354 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1355 if (!body) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1356 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1357 "field body is required for Exec");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1358 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1359 }
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	1360 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	1361 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1362 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1363 p->kind = Exec_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1364 p->v.Exec.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1365 p->v.Exec.globals = globals;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1366 p->v.Exec.locals = locals;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1367 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	1368 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1369 return p;
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
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1372 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	1373 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	1374 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1375 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	1376 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	1377 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1378 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1379 p->kind = Global_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1380 p->v.Global.names = names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1381 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	1382 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1383 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1384 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1385
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1386 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	1387 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	1388 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1389 stmt_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1390 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1391 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1392 "field value is required for Expr");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1393 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1394 }
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	1395 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	1396 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1397 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1398 p->kind = Expr_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1399 p->v.Expr.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1400 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	1401 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1402 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1403 }
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 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	1406 Pass(int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1407 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1408 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	1409 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	1410 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1411 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1412 p->kind = Pass_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1413 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	1414 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1415 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1416 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1417
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1418 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	1419 Break(int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1420 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1421 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	1422 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	1423 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1424 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1425 p->kind = Break_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1426 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	1427 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1428 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1429 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1430
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1431 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	1432 Continue(int lineno, int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1433 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1434 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	1435 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	1436 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1437 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1438 p->kind = Continue_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1439 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	1440 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1441 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1442 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1443
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1444 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	1445 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	1446 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1447 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1448 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1449 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1450 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1451 "field op is required for BoolOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1452 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1453 }
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	1454 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	1455 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1456 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1457 p->kind = BoolOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1458 p->v.BoolOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1459 p->v.BoolOp.values = values;
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 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	1466 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	1467 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1468 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1469 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1470 if (!left) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1471 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1472 "field left is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1473 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1474 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1475 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1476 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1477 "field op is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1478 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1479 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1480 if (!right) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1481 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1482 "field right is required for BinOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1483 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1484 }
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	1485 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	1486 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1487 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1488 p->kind = BinOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1489 p->v.BinOp.left = left;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1490 p->v.BinOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1491 p->v.BinOp.right = right;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1492 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	1493 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1494 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1495 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1496
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1497 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	1498 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	1499 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1500 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1501 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1502 if (!op) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1503 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1504 "field op is required for UnaryOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1505 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1506 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1507 if (!operand) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1508 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1509 "field operand is required for UnaryOp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1510 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1511 }
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	1512 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	1513 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1514 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1515 p->kind = UnaryOp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1516 p->v.UnaryOp.op = op;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1517 p->v.UnaryOp.operand = operand;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1518 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	1519 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1520 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1521 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1522
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1523 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	1524 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	1525 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1526 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1527 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1528 if (!args) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1529 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1530 "field args is required for Lambda");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1531 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1532 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1533 if (!body) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1534 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1535 "field body is required for Lambda");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1536 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1537 }
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	1538 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	1539 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1540 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1541 p->kind = Lambda_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1542 p->v.Lambda.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1543 p->v.Lambda.body = body;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1544 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	1545 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1546 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1547 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1548
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1549 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	1550 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	1551 PyArena *arena)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1552 {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1553 expr_ty p;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1554 if (!test) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1555 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1556 "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	1557 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1558 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1559 if (!body) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1560 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1561 "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	1562 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1563 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1564 if (!orelse) {
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1565 PyErr_SetString(PyExc_ValueError,
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1566 "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	1567 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1568 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1569 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	1570 if (!p)
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1571 return NULL;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1572 p->kind = IfExp_kind;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1573 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	1574 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	1575 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	1576 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	1577 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	1578 return p;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1579 }
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1580
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	1581 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	1582 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	1583 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1584 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1585 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	1586 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	1587 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1588 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1589 p->kind = Dict_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1590 p->v.Dict.keys = keys;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1591 p->v.Dict.values = values;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1592 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	1593 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1594 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1595 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1596
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1597 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	1598 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	1599 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1600 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1601 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1602 if (!elt) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1603 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1604 "field elt is required for ListComp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1605 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1606 }
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	1607 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	1608 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1609 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1610 p->kind = ListComp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1611 p->v.ListComp.elt = elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1612 p->v.ListComp.generators = generators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1613 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	1614 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1615 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1616 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1617
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1618 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	1619 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	1620 PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1621 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1622 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1623 if (!elt) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1624 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1625 "field elt is required for GeneratorExp");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1626 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1627 }
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	1628 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	1629 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1630 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1631 p->kind = GeneratorExp_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1632 p->v.GeneratorExp.elt = elt;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1633 p->v.GeneratorExp.generators = generators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1634 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	1635 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1636 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1637 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1638
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1639 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	1640 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	1641 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1642 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	1643 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	1644 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1645 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1646 p->kind = Yield_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1647 p->v.Yield.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1648 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	1649 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1650 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1651 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1652
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1653 expr_ty
37685 5e72b0c74100 Introduce asdl_int_seq, to hold cmpop_ty. Martin v. Löwis <martin@v.loewis.de> parents: 37601 diff changeset	1654 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	1655 int col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1656 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1657 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1658 if (!left) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1659 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1660 "field left is required for Compare");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1661 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1662 }
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	1663 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	1664 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1665 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1666 p->kind = Compare_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1667 p->v.Compare.left = left;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1668 p->v.Compare.ops = ops;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1669 p->v.Compare.comparators = comparators;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1670 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	1671 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1672 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1673 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1674
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1675 expr_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1676 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	1677 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	1678 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1679 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1680 if (!func) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1681 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1682 "field func is required for Call");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1683 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1684 }
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	1685 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	1686 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1687 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1688 p->kind = Call_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1689 p->v.Call.func = func;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1690 p->v.Call.args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1691 p->v.Call.keywords = keywords;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1692 p->v.Call.starargs = starargs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1693 p->v.Call.kwargs = kwargs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1694 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	1695 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1696 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1697 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1698
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1699 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	1700 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	1701 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1702 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1703 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1704 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1705 "field value is required for Repr");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1706 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1707 }
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	1708 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	1709 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1710 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1711 p->kind = Repr_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1712 p->v.Repr.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1713 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	1714 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1715 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1716 }
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
36786 57322cb2ca11 Patch #1440601: Add col_offset attribute to AST nodes. Martin v. Löwis <martin@v.loewis.de> parents: 36743 diff changeset	1719 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	1720 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1721 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1722 if (!n) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1723 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1724 "field n is required for Num");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1725 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1726 }
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	1727 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	1728 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1729 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1730 p->kind = Num_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1731 p->v.Num.n = n;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1732 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	1733 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1734 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1735 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1736
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1737 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	1738 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	1739 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1740 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1741 if (!s) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1742 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1743 "field s is required for Str");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1744 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1745 }
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	1746 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	1747 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1748 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1749 p->kind = Str_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1750 p->v.Str.s = s;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1751 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	1752 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1753 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1754 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1755
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1756 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	1757 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	1758 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1759 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1760 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1761 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1762 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1763 "field value is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1764 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1765 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1766 if (!attr) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1767 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1768 "field attr is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1769 return NULL;
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 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1772 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1773 "field ctx is required for Attribute");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1774 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1775 }
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	1776 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	1777 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1778 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1779 p->kind = Attribute_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1780 p->v.Attribute.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1781 p->v.Attribute.attr = attr;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1782 p->v.Attribute.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1783 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	1784 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1785 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1786 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1787
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1788 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	1789 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	1790 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1791 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1792 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1793 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1794 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1795 "field value is required for Subscript");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1796 return NULL;
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 if (!slice) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1799 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1800 "field slice is required for Subscript");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1801 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1802 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1803 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1804 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1805 "field ctx is required for Subscript");
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 }
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	1808 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	1809 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1810 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1811 p->kind = Subscript_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1812 p->v.Subscript.value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1813 p->v.Subscript.slice = slice;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1814 p->v.Subscript.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1815 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	1816 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1817 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1818 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1819
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1820 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	1821 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	1822 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1823 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1824 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1825 if (!id) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1826 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1827 "field id is required for Name");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1828 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1829 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1830 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1831 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1832 "field ctx is required for Name");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1833 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1834 }
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	1835 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	1836 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1837 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1838 p->kind = Name_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1839 p->v.Name.id = id;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1840 p->v.Name.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1841 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	1842 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1843 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1844 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1845
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1846 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	1847 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	1848 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1849 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1850 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1851 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1852 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1853 "field ctx is required for List");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1854 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1855 }
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	1856 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	1857 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1858 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1859 p->kind = List_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1860 p->v.List.elts = elts;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1861 p->v.List.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1862 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	1863 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1864 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1865 }
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 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	1868 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	1869 *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1870 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1871 expr_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1872 if (!ctx) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1873 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1874 "field ctx is required for Tuple");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1875 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1876 }
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	1877 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	1878 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1879 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1880 p->kind = Tuple_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1881 p->v.Tuple.elts = elts;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1882 p->v.Tuple.ctx = ctx;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1883 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	1884 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1885 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1886 }
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 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	1889 Ellipsis(PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1890 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1891 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	1892 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	1893 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1894 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1895 p->kind = Ellipsis_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1896 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1897 }
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 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	1900 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	1901 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1902 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	1903 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	1904 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1905 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1906 p->kind = Slice_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1907 p->v.Slice.lower = lower;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1908 p->v.Slice.upper = upper;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1909 p->v.Slice.step = step;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1910 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1911 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1912
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1913 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	1914 ExtSlice(asdl_seq * dims, PyArena *arena)
35742 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 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	1917 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	1918 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1919 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1920 p->kind = ExtSlice_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1921 p->v.ExtSlice.dims = dims;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1922 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1923 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1924
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1925 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	1926 Index(expr_ty value, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1927 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1928 slice_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1929 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1930 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1931 "field value is required for Index");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1932 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1933 }
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	1934 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	1935 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1936 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1937 p->kind = Index_kind;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1938 p->v.Index.value = value;
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 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	1943 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	1944 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1945 comprehension_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1946 if (!target) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1947 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1948 "field target is required for comprehension");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1949 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1950 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1951 if (!iter) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1952 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1953 "field iter is required for comprehension");
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 }
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	1956 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	1957 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1958 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1959 p->target = target;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1960 p->iter = iter;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1961 p->ifs = ifs;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1962 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1963 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1964
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1965 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	1966 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	1967 col_offset, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1968 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1969 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	1970 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	1971 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1972 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	1973 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	1974 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	1975 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	1976 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	1977 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	1978 p->col_offset = col_offset;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1979 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1980 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1981
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1982 arguments_ty
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1983 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	1984 defaults, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1985 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1986 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	1987 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	1988 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1989 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1990 p->args = args;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1991 p->vararg = vararg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1992 p->kwarg = kwarg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1993 p->defaults = defaults;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1994 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1995 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1996
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1997 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	1998 keyword(identifier arg, expr_ty value, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1999 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2000 keyword_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2001 if (!arg) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2002 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2003 "field arg is required for keyword");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2004 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2005 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2006 if (!value) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2007 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2008 "field value is required for keyword");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2009 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2010 }
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	2011 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	2012 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2013 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2014 p->arg = arg;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2015 p->value = value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2016 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2017 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2018
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2019 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	2020 alias(identifier name, identifier asname, PyArena *arena)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2021 {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2022 alias_ty p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2023 if (!name) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2024 PyErr_SetString(PyExc_ValueError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2025 "field name is required for alias");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2026 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2027 }
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	2028 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	2029 if (!p)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2030 return NULL;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2031 p->name = name;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2032 p->asname = asname;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2033 return p;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2034 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	2035
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2036
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2037 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2038 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	2039 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2040 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	2041 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	2042 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2043 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	2044 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2045 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2046
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2047 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2048 case Module_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2049 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	2050 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	2051 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	2052 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	2053 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	2054 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2055 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2056 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2057 case Interactive_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2058 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	2059 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	2060 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	2061 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	2062 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	2063 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2064 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2065 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2066 case Expression_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2067 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	2068 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	2069 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	2070 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	2071 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	2072 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2073 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2074 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2075 case Suite_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2076 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	2077 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	2078 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	2079 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	2080 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	2081 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2082 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2083 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2084 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2085 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2086 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2087 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2088 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2089 return NULL;
36174 85b2d804ac0a Regenerate. Martin v. Löwis <martin@v.loewis.de> parents: 36065 diff changeset	2090 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2091
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2092 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2093 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	2094 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2095 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	2096 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	2097 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2098 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	2099 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2100 }
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2101
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2102 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2103 case FunctionDef_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2104 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	2105 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	2106 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	2107 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	2108 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	2109 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2110 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2111 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	2112 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	2113 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	2114 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2115 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2116 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	2117 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	2118 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	2119 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2120 Py_DECREF(value);
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2121 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	2122 ast2obj_expr);
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2123 if (!value) goto failed;
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2124 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	2125 -1)
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2126 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2127 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2128 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2129 case ClassDef_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2130 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	2131 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	2132 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	2133 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	2134 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	2135 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2136 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2137 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	2138 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	2139 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	2140 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2141 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2142 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	2143 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	2144 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	2145 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2146 Py_DECREF(value);
45447 393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2147 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	2148 ast2obj_expr);
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2149 if (!value) goto failed;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2150 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	2151 -1)
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2152 goto failed;
393822f2ef90 Patch #1759: Backport of PEP 3129 class decorators Christian Heimes <christian@cheimes.de> parents: 40936 diff changeset	2153 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	2154 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2155 case Return_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2156 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	2157 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	2158 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	2159 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	2160 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	2161 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2162 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2163 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2164 case Delete_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2165 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	2166 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	2167 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	2168 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	2169 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	2170 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2171 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2172 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2173 case Assign_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2174 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	2175 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	2176 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	2177 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	2178 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	2179 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2180 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2181 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	2182 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	2183 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	2184 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2185 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2186 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2187 case AugAssign_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2188 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	2189 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	2190 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	2191 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	2192 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	2193 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2194 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2195 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	2196 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	2197 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	2198 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2199 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2200 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	2201 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	2202 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	2203 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2204 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2205 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2206 case Print_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2207 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	2208 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	2209 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	2210 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	2211 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	2212 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2213 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2214 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	2215 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	2216 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	2217 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2218 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2219 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	2220 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	2221 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	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 For_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(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	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_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	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, "target", 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_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	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, "iter", 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.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	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);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2243 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	2244 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	2245 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	2246 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2247 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2248 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2249 case While_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2250 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	2251 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	2252 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	2253 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	2254 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	2255 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2256 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2257 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	2258 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	2259 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	2260 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2261 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2262 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	2263 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	2264 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	2265 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2266 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2267 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2268 case If_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2269 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	2270 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	2271 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	2272 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	2273 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	2274 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2275 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2276 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	2277 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	2278 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	2279 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2280 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2281 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	2282 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	2283 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	2284 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2285 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2286 break;
36695 b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2287 case With_kind:
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2288 result = PyType_GenericNew(With_type, NULL, NULL);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2289 if (!result) goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2290 value = ast2obj_expr(o->v.With.context_expr);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2291 if (!value) goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2292 if (PyObject_SetAttrString(result, "context_expr", value) == -1)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2293 goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2294 Py_DECREF(value);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2295 value = ast2obj_expr(o->v.With.optional_vars);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2296 if (!value) goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2297 if (PyObject_SetAttrString(result, "optional_vars", value) ==
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2298 -1)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2299 goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2300 Py_DECREF(value);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2301 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	2302 if (!value) goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2303 if (PyObject_SetAttrString(result, "body", value) == -1)
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2304 goto failed;
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2305 Py_DECREF(value);
b6d2f6fd3e11 PEP 343 -- the with-statement. Guido van Rossum <guido@python.org> parents: 36669 diff changeset	2306 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2307 case Raise_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2308 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	2309 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	2310 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	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, "type", 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_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	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, "inst", 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 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	2321 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	2322 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	2323 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2324 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2325 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2326 case TryExcept_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2327 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	2328 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	2329 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	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, "body", 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.TryExcept.handlers,
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2335 ast2obj_excepthandler);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2336 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	2337 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	2338 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2339 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2340 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	2341 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	2342 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	2343 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2344 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2345 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2346 case TryFinally_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2347 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	2348 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	2349 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	2350 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	2351 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	2352 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2353 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2354 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	2355 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	2356 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	2357 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2358 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2359 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2360 case Assert_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2361 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	2362 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	2363 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	2364 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	2365 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	2366 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2367 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2368 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	2369 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	2370 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	2371 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2372 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2373 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2374 case Import_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2375 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	2376 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	2377 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	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, "names", 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;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2383 case ImportFrom_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2384 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	2385 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	2386 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	2387 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	2388 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	2389 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2390 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2391 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	2392 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	2393 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	2394 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2395 Py_DECREF(value);
36712 5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2396 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	2397 if (!value) goto failed;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2398 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	2399 goto failed;
5c36c222e7ca SF patch #1438387, PEP 328: relative and absolute imports. Thomas Wouters <thomas@python.org> parents: 36707 diff changeset	2400 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	2401 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2402 case Exec_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2403 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	2404 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	2405 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	2406 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	2407 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	2408 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2409 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2410 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	2411 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	2412 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	2413 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2414 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2415 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	2416 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	2417 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	2418 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2419 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2420 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2421 case Global_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2422 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	2423 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	2424 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	2425 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	2426 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	2427 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2428 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2429 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2430 case Expr_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2431 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	2432 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	2433 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	2434 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	2435 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	2436 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2437 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2438 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2439 case Pass_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2440 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	2441 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	2442 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2443 case Break_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2444 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	2445 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	2446 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2447 case Continue_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2448 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	2449 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	2450 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2451 }
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2452 value = ast2obj_int(o->lineno);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2453 if (!value) goto failed;
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2454 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	2455 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2456 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	2457 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	2458 if (!value) goto failed;
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2459 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	2460 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2461 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	2462 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2463 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2464 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2465 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2466 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2467 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2468
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2469 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2470 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	2471 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2472 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	2473 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	2474 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2475 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	2476 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2477 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2478
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2479 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2480 case BoolOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2481 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	2482 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	2483 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	2484 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	2485 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	2486 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2487 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2488 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	2489 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	2490 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	2491 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2492 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2493 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2494 case BinOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2495 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	2496 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	2497 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	2498 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	2499 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	2500 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2501 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2502 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	2503 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	2504 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	2505 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2506 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2507 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	2508 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	2509 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	2510 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2511 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2512 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2513 case UnaryOp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2514 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	2515 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	2516 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	2517 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	2518 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	2519 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2520 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2521 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	2522 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	2523 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	2524 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2525 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2526 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2527 case Lambda_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2528 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	2529 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	2530 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	2531 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	2532 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	2533 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2534 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2535 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	2536 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	2537 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	2538 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2539 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2540 break;
36666 6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2541 case IfExp_kind:
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2542 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	2543 if (!result) goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2544 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	2545 if (!value) goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2546 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	2547 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2548 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2549 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	2550 if (!value) goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2551 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	2552 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2553 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2554 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	2555 if (!value) goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2556 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	2557 goto failed;
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2558 Py_DECREF(value);
6165927431d6 PEP 308 implementation, including minor refdocs and some testcases. It Thomas Wouters <thomas@python.org> parents: 36665 diff changeset	2559 break;
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2560 case Dict_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2561 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	2562 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	2563 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	2564 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	2565 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	2566 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2567 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2568 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	2569 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	2570 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	2571 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2572 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2573 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2574 case ListComp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2575 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	2576 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	2577 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	2578 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	2579 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	2580 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2581 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2582 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	2583 ast2obj_comprehension);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2584 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	2585 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	2586 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2587 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2588 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2589 case GeneratorExp_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2590 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	2591 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	2592 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	2593 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	2594 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	2595 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2596 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2597 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	2598 ast2obj_comprehension);
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, "generators", 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 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2604 case Yield_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2605 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	2606 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	2607 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	2608 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	2609 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	2610 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2611 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2612 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2613 case Compare_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2614 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	2615 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	2616 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	2617 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	2618 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	2619 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2620 Py_DECREF(value);
36661 710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2621 {
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2622 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	2623 value = PyList_New(n);
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2624 if (!value) goto failed;
710cbdd478a8 Fix iterating over cmpop_ty lists. Martin v. Löwis <martin@v.loewis.de> parents: 36660 diff changeset	2625 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	2626 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	2627 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2628 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	2629 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	2630 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2631 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2632 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	2633 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	2634 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	2635 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2636 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2637 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2638 case Call_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2639 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	2640 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	2641 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	2642 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	2643 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	2644 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2645 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2646 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	2647 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	2648 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	2649 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2650 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2651 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	2652 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	2653 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	2654 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2655 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2656 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	2657 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	2658 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	2659 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2660 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2661 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	2662 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	2663 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	2664 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2665 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2666 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2667 case Repr_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2668 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	2669 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	2670 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	2671 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	2672 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	2673 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2674 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2675 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2676 case Num_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2677 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	2678 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	2679 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	2680 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	2681 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	2682 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2683 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2684 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2685 case Str_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2686 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	2687 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	2688 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	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, "s", 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;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2694 case Attribute_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2695 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	2696 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	2697 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	2698 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	2699 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	2700 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2701 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2702 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	2703 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	2704 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	2705 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2706 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2707 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	2708 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	2709 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	2710 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2711 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2712 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2713 case Subscript_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2714 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	2715 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	2716 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	2717 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	2718 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	2719 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2720 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2721 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	2722 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	2723 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	2724 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2725 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2726 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	2727 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	2728 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	2729 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2730 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2731 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2732 case Name_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2733 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	2734 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	2735 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	2736 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	2737 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	2738 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2739 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2740 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	2741 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	2742 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	2743 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2744 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2745 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2746 case List_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2747 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	2748 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	2749 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	2750 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	2751 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	2752 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2753 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2754 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	2755 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	2756 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	2757 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2758 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2759 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2760 case Tuple_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2761 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	2762 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	2763 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	2764 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	2765 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	2766 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2767 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2768 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	2769 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	2770 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	2771 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2772 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2773 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2774 }
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2775 value = ast2obj_int(o->lineno);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	2776 if (!value) goto failed;
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2777 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	2778 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2779 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	2780 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	2781 if (!value) goto failed;
36794 df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2782 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	2783 goto failed;
df843b07f5fe Fix memory leak on attributes. Martin v. Löwis <martin@v.loewis.de> parents: 36786 diff changeset	2784 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	2785 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2786 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2787 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2788 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2789 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2790 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2791
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2792 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	2793 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2794 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2795 case Load:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2796 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	2797 return Load_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2798 case Store:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2799 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	2800 return Store_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2801 case Del:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2802 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	2803 return Del_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2804 case AugLoad:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2805 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	2806 return AugLoad_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2807 case AugStore:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2808 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	2809 return AugStore_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2810 case Param:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2811 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	2812 return Param_singleton;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2813 default:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2814 /* 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	2815 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	2816 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2817 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2818 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2819 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2820 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	2821 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2822 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	2823 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	2824 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2825 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	2826 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2827 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2828
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2829 switch (o->kind) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2830 case Ellipsis_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2831 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	2832 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	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 Slice_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(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	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.Slice.lower);
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, "lower", 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_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	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, "upper", 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(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	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, "step", 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 ExtSlice_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(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	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_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	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, "dims", 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 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2862 case Index_kind:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2863 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	2864 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	2865 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	2866 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	2867 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	2868 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2869 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2870 break;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2871 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2872 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2873 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2874 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2875 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2876 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2877 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	2878
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2879 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	2880 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2881 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2882 case And:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2883 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	2884 return And_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2885 case Or:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2886 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	2887 return Or_singleton;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2888 default:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2889 /* 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	2890 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	2891 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2892 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2893 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2894 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	2895 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2896 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2897 case Add:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2898 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	2899 return Add_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2900 case Sub:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2901 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	2902 return Sub_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2903 case Mult:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2904 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	2905 return Mult_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2906 case Div:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2907 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	2908 return Div_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2909 case Mod:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2910 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	2911 return Mod_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2912 case Pow:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2913 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	2914 return Pow_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2915 case LShift:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2916 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	2917 return LShift_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2918 case RShift:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2919 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	2920 return RShift_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2921 case BitOr:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2922 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	2923 return BitOr_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2924 case BitXor:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2925 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	2926 return BitXor_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2927 case BitAnd:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2928 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	2929 return BitAnd_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2930 case FloorDiv:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2931 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	2932 return FloorDiv_singleton;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2933 default:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2934 /* 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	2935 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	2936 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2937 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2938 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2939 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	2940 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2941 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2942 case Invert:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2943 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	2944 return Invert_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2945 case Not:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2946 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	2947 return Not_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2948 case UAdd:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2949 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	2950 return UAdd_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2951 case USub:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2952 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	2953 return USub_singleton;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2954 default:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2955 /* 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	2956 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	2957 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2958 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2959 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2960 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	2961 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2962 switch(o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2963 case Eq:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2964 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	2965 return Eq_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2966 case NotEq:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2967 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	2968 return NotEq_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2969 case Lt:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2970 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	2971 return Lt_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2972 case LtE:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2973 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	2974 return LtE_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2975 case Gt:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2976 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	2977 return Gt_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2978 case GtE:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2979 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	2980 return GtE_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2981 case Is:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2982 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	2983 return Is_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2984 case IsNot:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2985 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	2986 return IsNot_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2987 case In:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2988 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	2989 return In_singleton;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2990 case NotIn:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2991 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	2992 return NotIn_singleton;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2993 default:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2994 /* 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	2995 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	2996 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	2997 }
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2998 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	2999 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3000 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	3001 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3002 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	3003 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	3004 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3005 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	3006 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3007 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3008
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3009 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	3010 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	3011 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	3012 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	3013 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	3014 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3015 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3016 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	3017 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	3018 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	3019 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3020 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3021 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	3022 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	3023 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	3024 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3025 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3026 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3027 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3028 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3029 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3030 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3031 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 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 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3034 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	3035 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3036 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	3037 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	3038 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3039 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	3040 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3041 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3042
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	3043 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	3044 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	3045 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	3046 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	3047 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	3048 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	3049 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	3050 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	3051 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	3052 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	3053 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	3054 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	3055 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	3056 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	3057 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	3058 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	3059 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	3060 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	3061 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	3062 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	3063 }
37453 16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	3064 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	3065 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	3066 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	3067 goto failed;
16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	3068 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	3069 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	3070 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	3071 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	3072 goto failed;
16a64e394602 Add lineno, col_offset to excephandler to enable future fix for Jeremy Hylton <jeremy@alum.mit.edu> parents: 37412 diff changeset	3073 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	3074 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3075 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3076 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3077 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3078 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3079 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3080
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3081 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3082 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	3083 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3084 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	3085 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	3086 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3087 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	3088 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3089 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3090
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3091 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	3092 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	3093 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	3094 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	3095 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	3096 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3097 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3098 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	3099 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	3100 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	3101 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3102 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3103 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	3104 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	3105 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	3106 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3107 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3108 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	3109 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	3110 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	3111 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3112 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3113 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3114 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3115 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3116 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3117 return NULL;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3118 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3119
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3120 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3121 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	3122 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3123 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	3124 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	3125 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3126 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	3127 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3128 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3129
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3130 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	3131 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	3132 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	3133 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	3134 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	3135 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3136 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3137 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	3138 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	3139 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	3140 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3141 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3142 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3143 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3144 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3145 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3146 return NULL;
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 PyObject*
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3150 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	3151 {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3152 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	3153 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	3154 if (!o) {
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3155 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	3156 return Py_None;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3157 }
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3158
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3159 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	3160 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	3161 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	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, "name", 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 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	3167 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	3168 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	3169 goto failed;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3170 Py_DECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3171 return result;
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3172 failed:
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3173 Py_XDECREF(value);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3174 Py_XDECREF(result);
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	3175 return NULL;
35866 9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3176 }
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3177
9f73dc0953d2 Whoops, checkin consistent versions of all files to stop polluting Neal Norwitz <nnorwitz@gmail.com> parents: 35862 diff changeset	3178
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3179 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3180 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	3181 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3182 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3183 int isinstance;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3184
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3185
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3186 if (obj == Py_None) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3187 *out = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3188 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3189 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3190 isinstance = PyObject_IsInstance(obj, (PyObject*)Module_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3191 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3192 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3193 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3194 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3195 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3196
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3197 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3198 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3199 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3200 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3201 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3202 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3203 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3204 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	3205 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3206 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3207 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3208 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3209 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3210 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3211 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3212 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	3213 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3214 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3215 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3216 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3217 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3218 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3219 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	3220 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3221 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3222 *out = Module(body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3223 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3224 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3225 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3226 isinstance = PyObject_IsInstance(obj, (PyObject*)Interactive_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3227 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3228 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3229 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3230 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3231 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3232
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3233 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3234 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3235 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3236 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3237 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3238 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3239 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3240 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	3241 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3242 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3243 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3244 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3245 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3246 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3247 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3248 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	3249 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3250 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3251 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3252 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3253 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3254 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3255 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	3256 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3257 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3258 *out = Interactive(body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3259 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3260 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3261 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3262 isinstance = PyObject_IsInstance(obj, (PyObject*)Expression_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3263 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3264 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3265 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3266 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3267 expr_ty body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3268
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3269 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3270 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3271 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3272 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3273 res = obj2ast_expr(tmp, &body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3274 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3275 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3276 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3277 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3278 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	3279 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3280 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3281 *out = Expression(body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3282 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3283 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3284 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3285 isinstance = PyObject_IsInstance(obj, (PyObject*)Suite_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3286 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3287 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3288 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3289 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3290 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3291
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3292 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3293 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3294 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3295 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3296 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3297 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3298 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3299 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	3300 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3301 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3302 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3303 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3304 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3305 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3306 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3307 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	3308 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3309 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3310 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3311 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3312 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3313 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3314 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	3315 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3316 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3317 *out = Suite(body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3318 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3319 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3320 }
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 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3323 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	3324 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	3325 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3326 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3327 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3328 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3329
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3330 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3331 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	3332 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3333 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3334 int isinstance;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3335
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3336 int lineno;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3337 int col_offset;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3338
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3339 if (obj == Py_None) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3340 *out = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3341 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3342 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3343 if (PyObject_HasAttrString(obj, "lineno")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3344 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3345 tmp = PyObject_GetAttrString(obj, "lineno");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3346 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3347 res = obj2ast_int(tmp, &lineno, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3348 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3349 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3350 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3351 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3352 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	3353 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3354 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3355 if (PyObject_HasAttrString(obj, "col_offset")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3356 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3357 tmp = PyObject_GetAttrString(obj, "col_offset");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3358 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3359 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	3360 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3361 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3362 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3363 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3364 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	3365 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3366 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3367 isinstance = PyObject_IsInstance(obj, (PyObject*)FunctionDef_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3368 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3369 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3370 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3371 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3372 identifier name;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3373 arguments_ty args;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3374 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3375 asdl_seq* decorator_list;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3376
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3377 if (PyObject_HasAttrString(obj, "name")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3378 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3379 tmp = PyObject_GetAttrString(obj, "name");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3380 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3381 res = obj2ast_identifier(tmp, &name, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3382 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3383 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3384 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3385 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3386 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	3387 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3388 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3389 if (PyObject_HasAttrString(obj, "args")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3390 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3391 tmp = PyObject_GetAttrString(obj, "args");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3392 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3393 res = obj2ast_arguments(tmp, &args, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3394 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3395 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3396 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3397 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3398 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	3399 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3400 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3401 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3402 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3403 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3404 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3405 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3406 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3407 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3408 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	3409 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3410 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3411 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3412 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3413 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3414 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3415 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3416 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	3417 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3418 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3419 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3420 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3421 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3422 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3423 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	3424 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3425 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3426 if (PyObject_HasAttrString(obj, "decorator_list")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3427 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3428 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3429 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3430 tmp = PyObject_GetAttrString(obj, "decorator_list");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3431 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3432 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3433 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	3434 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3435 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3436 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3437 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	3438 if (decorator_list == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3439 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3440 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3441 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	3442 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3443 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	3444 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3445 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3446 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3447 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3448 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	3449 return 1;
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 *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	3452 col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3453 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3454 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3455 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3456 isinstance = PyObject_IsInstance(obj, (PyObject*)ClassDef_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3457 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3458 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3459 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3460 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3461 identifier name;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3462 asdl_seq* bases;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3463 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3464 asdl_seq* decorator_list;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3465
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3466 if (PyObject_HasAttrString(obj, "name")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3467 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3468 tmp = PyObject_GetAttrString(obj, "name");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3469 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3470 res = obj2ast_identifier(tmp, &name, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3471 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3472 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3473 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3474 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3475 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	3476 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3477 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3478 if (PyObject_HasAttrString(obj, "bases")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3479 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3480 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3481 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3482 tmp = PyObject_GetAttrString(obj, "bases");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3483 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3484 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3485 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	3486 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3487 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3488 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3489 bases = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3490 if (bases == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3491 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3492 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3493 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	3494 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3495 asdl_seq_SET(bases, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3496 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3497 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3498 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3499 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3500 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	3501 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3502 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3503 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3504 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3505 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3506 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3507 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3508 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3509 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3510 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	3511 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3512 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3513 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3514 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3515 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3516 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3517 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3518 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	3519 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3520 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3521 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3522 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3523 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3524 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3525 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	3526 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3527 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3528 if (PyObject_HasAttrString(obj, "decorator_list")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3529 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3530 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3531 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3532 tmp = PyObject_GetAttrString(obj, "decorator_list");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3533 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3534 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3535 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	3536 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3537 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3538 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3539 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	3540 if (decorator_list == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3541 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3542 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3543 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	3544 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3545 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	3546 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3547 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3548 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3549 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3550 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	3551 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3552 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3553 *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	3554 col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3555 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3556 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3557 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3558 isinstance = PyObject_IsInstance(obj, (PyObject*)Return_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3559 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3560 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3561 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3562 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3563 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3564
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3565 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3566 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3567 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3568 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3569 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3570 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3571 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3572 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3573 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3574 value = NULL;
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 *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	3577 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3578 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3579 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3580 isinstance = PyObject_IsInstance(obj, (PyObject*)Delete_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3581 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3582 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3583 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3584 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3585 asdl_seq* targets;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3586
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3587 if (PyObject_HasAttrString(obj, "targets")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3588 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3589 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3590 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3591 tmp = PyObject_GetAttrString(obj, "targets");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3592 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3593 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3594 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	3595 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3596 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3597 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3598 targets = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3599 if (targets == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3600 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3601 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3602 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	3603 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3604 asdl_seq_SET(targets, i, value);
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 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3607 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3608 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3609 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	3610 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3611 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3612 *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	3613 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3614 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3615 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3616 isinstance = PyObject_IsInstance(obj, (PyObject*)Assign_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3617 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3618 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3619 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3620 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3621 asdl_seq* targets;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3622 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3623
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3624 if (PyObject_HasAttrString(obj, "targets")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3625 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3626 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3627 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3628 tmp = PyObject_GetAttrString(obj, "targets");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3629 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3630 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3631 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	3632 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3633 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3634 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3635 targets = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3636 if (targets == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3637 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3638 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3639 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	3640 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3641 asdl_seq_SET(targets, i, value);
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 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3644 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3645 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3646 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	3647 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3648 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3649 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3650 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3651 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3652 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3653 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3654 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3655 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3656 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3657 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3658 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	3659 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3660 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3661 *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	3662 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3663 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3664 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3665 isinstance = PyObject_IsInstance(obj, (PyObject*)AugAssign_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3666 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3667 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3668 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3669 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3670 expr_ty target;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3671 operator_ty op;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3672 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3673
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3674 if (PyObject_HasAttrString(obj, "target")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3675 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3676 tmp = PyObject_GetAttrString(obj, "target");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3677 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3678 res = obj2ast_expr(tmp, &target, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3679 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3680 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3681 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3682 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3683 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	3684 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3685 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3686 if (PyObject_HasAttrString(obj, "op")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3687 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3688 tmp = PyObject_GetAttrString(obj, "op");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3689 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3690 res = obj2ast_operator(tmp, &op, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3691 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3692 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3693 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3694 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3695 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	3696 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3697 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3698 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3699 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3700 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3701 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3702 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3703 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3704 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3705 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3706 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3707 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	3708 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3709 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3710 *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	3711 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3712 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3713 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3714 isinstance = PyObject_IsInstance(obj, (PyObject*)Print_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3715 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3716 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3717 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3718 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3719 expr_ty dest;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3720 asdl_seq* values;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3721 bool nl;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3722
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3723 if (PyObject_HasAttrString(obj, "dest")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3724 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3725 tmp = PyObject_GetAttrString(obj, "dest");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3726 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3727 res = obj2ast_expr(tmp, &dest, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3728 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3729 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3730 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3731 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3732 dest = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3733 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3734 if (PyObject_HasAttrString(obj, "values")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3735 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3736 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3737 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3738 tmp = PyObject_GetAttrString(obj, "values");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3739 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3740 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3741 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	3742 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3743 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3744 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3745 values = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3746 if (values == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3747 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3748 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3749 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	3750 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3751 asdl_seq_SET(values, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3752 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3753 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3754 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3755 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3756 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	3757 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3758 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3759 if (PyObject_HasAttrString(obj, "nl")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3760 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3761 tmp = PyObject_GetAttrString(obj, "nl");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3762 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3763 res = obj2ast_bool(tmp, &nl, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3764 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3765 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3766 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3767 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3768 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	3769 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3770 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3771 *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	3772 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3773 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3774 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3775 isinstance = PyObject_IsInstance(obj, (PyObject*)For_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3776 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3777 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3778 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3779 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3780 expr_ty target;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3781 expr_ty iter;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3782 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3783 asdl_seq* orelse;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3784
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3785 if (PyObject_HasAttrString(obj, "target")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3786 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3787 tmp = PyObject_GetAttrString(obj, "target");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3788 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3789 res = obj2ast_expr(tmp, &target, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3790 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3791 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3792 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3793 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3794 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	3795 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3796 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3797 if (PyObject_HasAttrString(obj, "iter")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3798 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3799 tmp = PyObject_GetAttrString(obj, "iter");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3800 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3801 res = obj2ast_expr(tmp, &iter, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3802 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3803 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3804 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3805 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3806 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	3807 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3808 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3809 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3810 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3811 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3812 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3813 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3814 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3815 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3816 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	3817 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3818 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3819 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3820 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3821 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3822 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3823 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3824 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	3825 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3826 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3827 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3828 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3829 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3830 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3831 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	3832 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3833 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3834 if (PyObject_HasAttrString(obj, "orelse")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3835 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3836 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3837 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3838 tmp = PyObject_GetAttrString(obj, "orelse");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3839 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3840 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3841 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	3842 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3843 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3844 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3845 orelse = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3846 if (orelse == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3847 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3848 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3849 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	3850 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3851 asdl_seq_SET(orelse, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3852 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3853 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3854 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3855 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3856 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	3857 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3858 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3859 *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	3860 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3861 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3862 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3863 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3864 isinstance = PyObject_IsInstance(obj, (PyObject*)While_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3865 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3866 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3867 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3868 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3869 expr_ty test;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3870 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3871 asdl_seq* orelse;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3872
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3873 if (PyObject_HasAttrString(obj, "test")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3874 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3875 tmp = PyObject_GetAttrString(obj, "test");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3876 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3877 res = obj2ast_expr(tmp, &test, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3878 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3879 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3880 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3881 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3882 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	3883 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3884 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3885 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3886 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3887 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3888 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3889 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3890 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3891 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3892 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	3893 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3894 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3895 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3896 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3897 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3898 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3899 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3900 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	3901 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3902 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3903 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3904 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3905 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3906 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3907 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	3908 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3909 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3910 if (PyObject_HasAttrString(obj, "orelse")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3911 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3912 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3913 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3914 tmp = PyObject_GetAttrString(obj, "orelse");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3915 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3916 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3917 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	3918 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3919 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3920 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3921 orelse = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3922 if (orelse == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3923 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3924 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3925 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	3926 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3927 asdl_seq_SET(orelse, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3928 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3929 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3930 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3931 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3932 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	3933 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3934 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3935 *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	3936 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3937 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3938 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3939 isinstance = PyObject_IsInstance(obj, (PyObject*)If_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3940 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3941 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3942 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	3943 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3944 expr_ty test;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3945 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3946 asdl_seq* orelse;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3947
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3948 if (PyObject_HasAttrString(obj, "test")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3949 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3950 tmp = PyObject_GetAttrString(obj, "test");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3951 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3952 res = obj2ast_expr(tmp, &test, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3953 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3954 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3955 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3956 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3957 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	3958 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3959 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3960 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3961 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3962 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3963 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3964 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3965 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3966 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3967 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	3968 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3969 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3970 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3971 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3972 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3973 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3974 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3975 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	3976 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3977 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3978 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3979 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3980 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3981 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3982 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	3983 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3984 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3985 if (PyObject_HasAttrString(obj, "orelse")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3986 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3987 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3988 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3989 tmp = PyObject_GetAttrString(obj, "orelse");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3990 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3991 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3992 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	3993 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3994 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3995 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3996 orelse = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3997 if (orelse == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3998 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	3999 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4000 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	4001 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4002 asdl_seq_SET(orelse, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4003 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4004 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4005 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4006 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4007 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	4008 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4009 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4010 *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	4011 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4012 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4013 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4014 isinstance = PyObject_IsInstance(obj, (PyObject*)With_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4015 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4016 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4017 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4018 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4019 expr_ty context_expr;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4020 expr_ty optional_vars;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4021 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4022
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4023 if (PyObject_HasAttrString(obj, "context_expr")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4024 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4025 tmp = PyObject_GetAttrString(obj, "context_expr");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4026 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4027 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	4028 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4029 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4030 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4031 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4032 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	4033 return 1;
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 if (PyObject_HasAttrString(obj, "optional_vars")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4036 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4037 tmp = PyObject_GetAttrString(obj, "optional_vars");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4038 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4039 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	4040 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4041 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4042 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4043 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4044 optional_vars = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4045 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4046 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4047 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4048 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4049 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4050 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4051 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4052 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4053 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	4054 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4055 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4056 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4057 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4058 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4059 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4060 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4061 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	4062 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4063 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4064 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4065 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4066 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4067 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4068 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	4069 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4070 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4071 *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	4072 col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4073 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4074 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4075 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4076 isinstance = PyObject_IsInstance(obj, (PyObject*)Raise_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4077 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4078 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4079 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4080 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4081 expr_ty type;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4082 expr_ty inst;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4083 expr_ty tback;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4084
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4085 if (PyObject_HasAttrString(obj, "type")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4086 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4087 tmp = PyObject_GetAttrString(obj, "type");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4088 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4089 res = obj2ast_expr(tmp, &type, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4090 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4091 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4092 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4093 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4094 type = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4095 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4096 if (PyObject_HasAttrString(obj, "inst")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4097 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4098 tmp = PyObject_GetAttrString(obj, "inst");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4099 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4100 res = obj2ast_expr(tmp, &inst, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4101 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4102 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4103 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4104 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4105 inst = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4106 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4107 if (PyObject_HasAttrString(obj, "tback")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4108 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4109 tmp = PyObject_GetAttrString(obj, "tback");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4110 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4111 res = obj2ast_expr(tmp, &tback, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4112 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4113 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4114 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4115 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4116 tback = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4117 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4118 *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	4119 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4120 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4121 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4122 isinstance = PyObject_IsInstance(obj, (PyObject*)TryExcept_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4123 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4124 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4125 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4126 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4127 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4128 asdl_seq* handlers;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4129 asdl_seq* orelse;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4130
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4131 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4132 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4133 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4134 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4135 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4136 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4137 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4138 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	4139 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4140 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4141 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4142 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4143 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4144 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4145 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4146 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	4147 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4148 asdl_seq_SET(body, i, value);
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 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4151 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4152 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4153 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	4154 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4155 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4156 if (PyObject_HasAttrString(obj, "handlers")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4157 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4158 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4159 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4160 tmp = PyObject_GetAttrString(obj, "handlers");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4161 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4162 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4163 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	4164 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4165 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4166 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4167 handlers = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4168 if (handlers == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4169 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4170 excepthandler_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4171 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	4172 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4173 asdl_seq_SET(handlers, i, value);
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 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4176 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4177 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4178 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	4179 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4180 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4181 if (PyObject_HasAttrString(obj, "orelse")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4182 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4183 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4184 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4185 tmp = PyObject_GetAttrString(obj, "orelse");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4186 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4187 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4188 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	4189 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4190 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4191 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4192 orelse = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4193 if (orelse == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4194 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4195 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4196 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	4197 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4198 asdl_seq_SET(orelse, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4199 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4200 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4201 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4202 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4203 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	4204 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4205 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4206 *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	4207 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4208 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4209 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4210 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4211 isinstance = PyObject_IsInstance(obj, (PyObject*)TryFinally_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4212 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4213 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4214 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4215 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4216 asdl_seq* body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4217 asdl_seq* finalbody;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4218
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4219 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4220 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4221 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4222 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4223 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4224 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4225 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4226 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	4227 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4228 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4229 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4230 body = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4231 if (body == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4232 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4233 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4234 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	4235 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4236 asdl_seq_SET(body, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4237 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4238 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4239 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4240 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4241 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	4242 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4243 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4244 if (PyObject_HasAttrString(obj, "finalbody")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4245 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4246 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4247 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4248 tmp = PyObject_GetAttrString(obj, "finalbody");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4249 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4250 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4251 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	4252 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4253 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4254 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4255 finalbody = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4256 if (finalbody == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4257 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4258 stmt_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4259 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	4260 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4261 asdl_seq_SET(finalbody, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4262 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4263 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4264 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4265 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4266 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	4267 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4268 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4269 *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	4270 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4271 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4272 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4273 isinstance = PyObject_IsInstance(obj, (PyObject*)Assert_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4274 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4275 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4276 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4277 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4278 expr_ty test;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4279 expr_ty msg;
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 if (PyObject_HasAttrString(obj, "test")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4282 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4283 tmp = PyObject_GetAttrString(obj, "test");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4284 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4285 res = obj2ast_expr(tmp, &test, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4286 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4287 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4288 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4289 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4290 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	4291 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4292 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4293 if (PyObject_HasAttrString(obj, "msg")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4294 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4295 tmp = PyObject_GetAttrString(obj, "msg");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4296 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4297 res = obj2ast_expr(tmp, &msg, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4298 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4299 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4300 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4301 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4302 msg = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4303 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4304 *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	4305 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4306 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4307 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4308 isinstance = PyObject_IsInstance(obj, (PyObject*)Import_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4309 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4310 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4311 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4312 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4313 asdl_seq* names;
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 if (PyObject_HasAttrString(obj, "names")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4316 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4317 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4318 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4319 tmp = PyObject_GetAttrString(obj, "names");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4320 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4321 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4322 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	4323 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4324 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4325 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4326 names = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4327 if (names == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4328 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4329 alias_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4330 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	4331 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4332 asdl_seq_SET(names, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4333 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4334 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4335 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4336 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4337 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	4338 return 1;
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 *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	4341 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4342 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4343 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4344 isinstance = PyObject_IsInstance(obj, (PyObject*)ImportFrom_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4345 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4346 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4347 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4348 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4349 identifier module;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4350 asdl_seq* names;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4351 int level;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4352
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4353 if (PyObject_HasAttrString(obj, "module")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4354 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4355 tmp = PyObject_GetAttrString(obj, "module");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4356 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4357 res = obj2ast_identifier(tmp, &module, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4358 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4359 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4360 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4361 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4362 PyErr_SetString(PyExc_TypeError, "required field \"module\" missing from ImportFrom");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4363 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4364 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4365 if (PyObject_HasAttrString(obj, "names")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4366 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4367 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4368 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4369 tmp = PyObject_GetAttrString(obj, "names");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4370 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4371 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4372 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	4373 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4374 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4375 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4376 names = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4377 if (names == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4378 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4379 alias_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4380 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	4381 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4382 asdl_seq_SET(names, i, value);
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 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4385 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4386 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4387 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	4388 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4389 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4390 if (PyObject_HasAttrString(obj, "level")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4391 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4392 tmp = PyObject_GetAttrString(obj, "level");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4393 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4394 res = obj2ast_int(tmp, &level, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4395 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4396 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4397 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4398 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4399 level = 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4400 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4401 *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	4402 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4403 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4404 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4405 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4406 isinstance = PyObject_IsInstance(obj, (PyObject*)Exec_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4407 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4408 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4409 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4410 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4411 expr_ty body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4412 expr_ty globals;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4413 expr_ty locals;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4414
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4415 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4416 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4417 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4418 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4419 res = obj2ast_expr(tmp, &body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4420 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4421 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4422 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4423 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4424 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	4425 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4426 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4427 if (PyObject_HasAttrString(obj, "globals")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4428 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4429 tmp = PyObject_GetAttrString(obj, "globals");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4430 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4431 res = obj2ast_expr(tmp, &globals, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4432 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4433 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4434 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4435 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4436 globals = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4437 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4438 if (PyObject_HasAttrString(obj, "locals")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4439 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4440 tmp = PyObject_GetAttrString(obj, "locals");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4441 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4442 res = obj2ast_expr(tmp, &locals, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4443 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4444 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4445 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4446 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4447 locals = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4448 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4449 *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	4450 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4451 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4452 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4453 isinstance = PyObject_IsInstance(obj, (PyObject*)Global_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4454 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4455 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4456 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4457 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4458 asdl_seq* names;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4459
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4460 if (PyObject_HasAttrString(obj, "names")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4461 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4462 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4463 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4464 tmp = PyObject_GetAttrString(obj, "names");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4465 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4466 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4467 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	4468 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4469 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4470 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4471 names = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4472 if (names == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4473 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4474 identifier value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4475 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	4476 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4477 asdl_seq_SET(names, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4478 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4479 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4480 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4481 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4482 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	4483 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4484 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4485 *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	4486 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4487 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4488 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4489 isinstance = PyObject_IsInstance(obj, (PyObject*)Expr_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4490 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4491 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4492 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4493 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4494 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4495
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4496 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4497 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4498 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4499 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4500 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4501 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4502 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4503 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4504 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4505 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	4506 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4507 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4508 *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	4509 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4510 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4511 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4512 isinstance = PyObject_IsInstance(obj, (PyObject*)Pass_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4513 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4514 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4515 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4516 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4517
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4518 *out = Pass(lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4519 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4520 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4521 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4522 isinstance = PyObject_IsInstance(obj, (PyObject*)Break_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4523 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4524 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4525 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4526 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4527
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4528 *out = Break(lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4529 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4530 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4531 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4532 isinstance = PyObject_IsInstance(obj, (PyObject*)Continue_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4533 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4534 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4535 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4536 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4537
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4538 *out = Continue(lineno, col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4539 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4540 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4541 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4542
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4543 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4544 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	4545 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	4546 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4547 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4548 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4549 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4550
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4551 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4552 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	4553 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4554 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4555 int isinstance;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4556
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4557 int lineno;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4558 int col_offset;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4559
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4560 if (obj == Py_None) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4561 *out = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4562 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4563 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4564 if (PyObject_HasAttrString(obj, "lineno")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4565 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4566 tmp = PyObject_GetAttrString(obj, "lineno");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4567 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4568 res = obj2ast_int(tmp, &lineno, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4569 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4570 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4571 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4572 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4573 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	4574 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4575 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4576 if (PyObject_HasAttrString(obj, "col_offset")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4577 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4578 tmp = PyObject_GetAttrString(obj, "col_offset");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4579 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4580 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	4581 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4582 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4583 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4584 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4585 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	4586 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4587 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4588 isinstance = PyObject_IsInstance(obj, (PyObject*)BoolOp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4589 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4590 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4591 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4592 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4593 boolop_ty op;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4594 asdl_seq* values;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4595
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4596 if (PyObject_HasAttrString(obj, "op")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4597 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4598 tmp = PyObject_GetAttrString(obj, "op");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4599 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4600 res = obj2ast_boolop(tmp, &op, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4601 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4602 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4603 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4604 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4605 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	4606 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4607 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4608 if (PyObject_HasAttrString(obj, "values")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4609 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4610 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4611 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4612 tmp = PyObject_GetAttrString(obj, "values");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4613 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4614 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4615 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	4616 goto failed;
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 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4619 values = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4620 if (values == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4621 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4622 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4623 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	4624 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4625 asdl_seq_SET(values, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4626 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4627 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4628 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4629 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4630 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	4631 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4632 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4633 *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	4634 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4635 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4636 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4637 isinstance = PyObject_IsInstance(obj, (PyObject*)BinOp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4638 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4639 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4640 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4641 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4642 expr_ty left;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4643 operator_ty op;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4644 expr_ty right;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4645
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4646 if (PyObject_HasAttrString(obj, "left")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4647 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4648 tmp = PyObject_GetAttrString(obj, "left");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4649 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4650 res = obj2ast_expr(tmp, &left, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4651 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4652 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4653 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4654 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4655 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	4656 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4657 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4658 if (PyObject_HasAttrString(obj, "op")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4659 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4660 tmp = PyObject_GetAttrString(obj, "op");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4661 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4662 res = obj2ast_operator(tmp, &op, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4663 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4664 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4665 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4666 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4667 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	4668 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4669 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4670 if (PyObject_HasAttrString(obj, "right")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4671 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4672 tmp = PyObject_GetAttrString(obj, "right");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4673 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4674 res = obj2ast_expr(tmp, &right, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4675 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4676 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4677 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4678 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4679 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	4680 return 1;
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 *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	4683 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4684 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4685 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4686 isinstance = PyObject_IsInstance(obj, (PyObject*)UnaryOp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4687 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4688 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4689 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4690 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4691 unaryop_ty op;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4692 expr_ty operand;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4693
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4694 if (PyObject_HasAttrString(obj, "op")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4695 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4696 tmp = PyObject_GetAttrString(obj, "op");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4697 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4698 res = obj2ast_unaryop(tmp, &op, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4699 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4700 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4701 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4702 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4703 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	4704 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4705 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4706 if (PyObject_HasAttrString(obj, "operand")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4707 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4708 tmp = PyObject_GetAttrString(obj, "operand");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4709 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4710 res = obj2ast_expr(tmp, &operand, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4711 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4712 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4713 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4714 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4715 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	4716 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4717 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4718 *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	4719 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4720 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4721 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4722 isinstance = PyObject_IsInstance(obj, (PyObject*)Lambda_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4723 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4724 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4725 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4726 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4727 arguments_ty args;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4728 expr_ty body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4729
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4730 if (PyObject_HasAttrString(obj, "args")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4731 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4732 tmp = PyObject_GetAttrString(obj, "args");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4733 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4734 res = obj2ast_arguments(tmp, &args, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4735 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4736 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4737 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4738 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4739 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	4740 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4741 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4742 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4743 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4744 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4745 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4746 res = obj2ast_expr(tmp, &body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4747 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4748 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4749 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4750 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4751 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	4752 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4753 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4754 *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	4755 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4756 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4757 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4758 isinstance = PyObject_IsInstance(obj, (PyObject*)IfExp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4759 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4760 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4761 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4762 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4763 expr_ty test;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4764 expr_ty body;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4765 expr_ty orelse;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4766
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4767 if (PyObject_HasAttrString(obj, "test")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4768 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4769 tmp = PyObject_GetAttrString(obj, "test");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4770 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4771 res = obj2ast_expr(tmp, &test, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4772 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4773 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4774 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4775 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4776 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	4777 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4778 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4779 if (PyObject_HasAttrString(obj, "body")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4780 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4781 tmp = PyObject_GetAttrString(obj, "body");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4782 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4783 res = obj2ast_expr(tmp, &body, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4784 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4785 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4786 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4787 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4788 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	4789 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4790 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4791 if (PyObject_HasAttrString(obj, "orelse")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4792 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4793 tmp = PyObject_GetAttrString(obj, "orelse");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4794 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4795 res = obj2ast_expr(tmp, &orelse, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4796 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4797 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4798 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4799 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4800 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	4801 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4802 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4803 *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	4804 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4805 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4806 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4807 isinstance = PyObject_IsInstance(obj, (PyObject*)Dict_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4808 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4809 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4810 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4811 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4812 asdl_seq* keys;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4813 asdl_seq* values;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4814
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4815 if (PyObject_HasAttrString(obj, "keys")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4816 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4817 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4818 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4819 tmp = PyObject_GetAttrString(obj, "keys");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4820 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4821 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4822 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	4823 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4824 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4825 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4826 keys = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4827 if (keys == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4828 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4829 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4830 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	4831 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4832 asdl_seq_SET(keys, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4833 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4834 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4835 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4836 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4837 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	4838 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4839 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4840 if (PyObject_HasAttrString(obj, "values")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4841 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4842 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4843 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4844 tmp = PyObject_GetAttrString(obj, "values");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4845 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4846 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4847 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	4848 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4849 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4850 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4851 values = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4852 if (values == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4853 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4854 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4855 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	4856 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4857 asdl_seq_SET(values, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4858 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4859 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4860 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4861 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4862 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	4863 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4864 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4865 *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	4866 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4867 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4868 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4869 isinstance = PyObject_IsInstance(obj, (PyObject*)ListComp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4870 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4871 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4872 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4873 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4874 expr_ty elt;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4875 asdl_seq* generators;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4876
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4877 if (PyObject_HasAttrString(obj, "elt")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4878 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4879 tmp = PyObject_GetAttrString(obj, "elt");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4880 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4881 res = obj2ast_expr(tmp, &elt, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4882 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4883 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4884 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4885 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4886 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	4887 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4888 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4889 if (PyObject_HasAttrString(obj, "generators")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4890 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4891 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4892 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4893 tmp = PyObject_GetAttrString(obj, "generators");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4894 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4895 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4896 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	4897 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4898 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4899 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4900 generators = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4901 if (generators == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4902 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4903 comprehension_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4904 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	4905 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4906 asdl_seq_SET(generators, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4907 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4908 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4909 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4910 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4911 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	4912 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4913 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4914 *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	4915 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4916 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4917 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4918 isinstance = PyObject_IsInstance(obj, (PyObject*)GeneratorExp_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4919 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4920 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4921 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4922 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4923 expr_ty elt;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4924 asdl_seq* generators;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4925
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4926 if (PyObject_HasAttrString(obj, "elt")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4927 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4928 tmp = PyObject_GetAttrString(obj, "elt");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4929 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4930 res = obj2ast_expr(tmp, &elt, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4931 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4932 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4933 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4934 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4935 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	4936 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4937 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4938 if (PyObject_HasAttrString(obj, "generators")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4939 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4940 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4941 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4942 tmp = PyObject_GetAttrString(obj, "generators");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4943 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4944 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4945 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	4946 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4947 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4948 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4949 generators = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4950 if (generators == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4951 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4952 comprehension_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4953 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	4954 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4955 asdl_seq_SET(generators, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4956 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4957 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4958 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4959 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4960 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	4961 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4962 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4963 *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	4964 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4965 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4966 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4967 isinstance = PyObject_IsInstance(obj, (PyObject*)Yield_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4968 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4969 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4970 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4971 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4972 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4973
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4974 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4975 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4976 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4977 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4978 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4979 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4980 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4981 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4982 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4983 value = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4984 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4985 *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	4986 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4987 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4988 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4989 isinstance = PyObject_IsInstance(obj, (PyObject*)Compare_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4990 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4991 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4992 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	4993 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4994 expr_ty left;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4995 asdl_int_seq* ops;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4996 asdl_seq* comparators;
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 if (PyObject_HasAttrString(obj, "left")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	4999 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5000 tmp = PyObject_GetAttrString(obj, "left");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5001 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5002 res = obj2ast_expr(tmp, &left, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5003 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5004 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5005 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5006 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5007 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	5008 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5009 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5010 if (PyObject_HasAttrString(obj, "ops")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5011 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5012 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5013 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5014 tmp = PyObject_GetAttrString(obj, "ops");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5015 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5016 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5017 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	5018 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5019 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5020 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5021 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	5022 if (ops == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5023 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5024 cmpop_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5025 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	5026 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5027 asdl_seq_SET(ops, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5028 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5029 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5030 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5031 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5032 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	5033 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5034 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5035 if (PyObject_HasAttrString(obj, "comparators")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5036 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5037 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5038 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5039 tmp = PyObject_GetAttrString(obj, "comparators");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5040 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5041 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5042 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	5043 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5044 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5045 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5046 comparators = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5047 if (comparators == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5048 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5049 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5050 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	5051 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5052 asdl_seq_SET(comparators, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5053 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5054 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5055 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5056 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5057 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	5058 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5059 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5060 *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	5061 arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5062 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5063 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5064 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5065 isinstance = PyObject_IsInstance(obj, (PyObject*)Call_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5066 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5067 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5068 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5069 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5070 expr_ty func;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5071 asdl_seq* args;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5072 asdl_seq* keywords;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5073 expr_ty starargs;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5074 expr_ty kwargs;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5075
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5076 if (PyObject_HasAttrString(obj, "func")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5077 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5078 tmp = PyObject_GetAttrString(obj, "func");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5079 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5080 res = obj2ast_expr(tmp, &func, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5081 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5082 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5083 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5084 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5085 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	5086 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5087 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5088 if (PyObject_HasAttrString(obj, "args")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5089 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5090 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5091 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5092 tmp = PyObject_GetAttrString(obj, "args");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5093 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5094 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5095 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	5096 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5097 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5098 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5099 args = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5100 if (args == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5101 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5102 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5103 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	5104 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5105 asdl_seq_SET(args, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5106 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5107 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5108 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5109 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5110 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	5111 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5112 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5113 if (PyObject_HasAttrString(obj, "keywords")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5114 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5115 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5116 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5117 tmp = PyObject_GetAttrString(obj, "keywords");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5118 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5119 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5120 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	5121 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5122 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5123 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5124 keywords = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5125 if (keywords == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5126 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5127 keyword_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5128 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	5129 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5130 asdl_seq_SET(keywords, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5131 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5132 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5133 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5134 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5135 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	5136 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5137 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5138 if (PyObject_HasAttrString(obj, "starargs")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5139 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5140 tmp = PyObject_GetAttrString(obj, "starargs");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5141 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5142 res = obj2ast_expr(tmp, &starargs, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5143 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5144 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5145 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5146 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5147 starargs = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5148 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5149 if (PyObject_HasAttrString(obj, "kwargs")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5150 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5151 tmp = PyObject_GetAttrString(obj, "kwargs");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5152 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5153 res = obj2ast_expr(tmp, &kwargs, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5154 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5155 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5156 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5157 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5158 kwargs = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5159 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5160 *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	5161 col_offset, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5162 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5163 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5164 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5165 isinstance = PyObject_IsInstance(obj, (PyObject*)Repr_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5166 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5167 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5168 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5169 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5170 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5171
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5172 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5173 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5174 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5175 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5176 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5177 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5178 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5179 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5180 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5181 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	5182 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5183 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5184 *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	5185 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5186 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5187 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5188 isinstance = PyObject_IsInstance(obj, (PyObject*)Num_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5189 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5190 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5191 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5192 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5193 object n;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5194
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5195 if (PyObject_HasAttrString(obj, "n")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5196 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5197 tmp = PyObject_GetAttrString(obj, "n");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5198 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5199 res = obj2ast_object(tmp, &n, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5200 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5201 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5202 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5203 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5204 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	5205 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5206 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5207 *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	5208 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5209 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5210 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5211 isinstance = PyObject_IsInstance(obj, (PyObject*)Str_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5212 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5213 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5214 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5215 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5216 string s;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5217
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5218 if (PyObject_HasAttrString(obj, "s")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5219 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5220 tmp = PyObject_GetAttrString(obj, "s");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5221 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5222 res = obj2ast_string(tmp, &s, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5223 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5224 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5225 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5226 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5227 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	5228 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5229 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5230 *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	5231 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5232 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5233 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5234 isinstance = PyObject_IsInstance(obj, (PyObject*)Attribute_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5235 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5236 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5237 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5238 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5239 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5240 identifier attr;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5241 expr_context_ty ctx;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5242
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5243 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5244 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5245 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5246 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5247 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5248 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5249 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5250 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5251 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5252 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	5253 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5254 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5255 if (PyObject_HasAttrString(obj, "attr")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5256 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5257 tmp = PyObject_GetAttrString(obj, "attr");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5258 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5259 res = obj2ast_identifier(tmp, &attr, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5260 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5261 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5262 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5263 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5264 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	5265 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5266 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5267 if (PyObject_HasAttrString(obj, "ctx")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5268 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5269 tmp = PyObject_GetAttrString(obj, "ctx");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5270 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5271 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	5272 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5273 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5274 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5275 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5276 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	5277 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5278 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5279 *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	5280 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5281 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5282 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5283 isinstance = PyObject_IsInstance(obj, (PyObject*)Subscript_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5284 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5285 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5286 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5287 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5288 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5289 slice_ty slice;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5290 expr_context_ty ctx;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5291
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5292 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5293 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5294 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5295 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5296 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5297 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5298 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5299 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5300 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5301 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	5302 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5303 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5304 if (PyObject_HasAttrString(obj, "slice")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5305 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5306 tmp = PyObject_GetAttrString(obj, "slice");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5307 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5308 res = obj2ast_slice(tmp, &slice, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5309 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5310 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5311 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5312 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5313 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	5314 return 1;
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 if (PyObject_HasAttrString(obj, "ctx")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5317 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5318 tmp = PyObject_GetAttrString(obj, "ctx");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5319 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5320 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	5321 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5322 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5323 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5324 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5325 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	5326 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5327 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5328 *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	5329 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5330 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5331 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5332 isinstance = PyObject_IsInstance(obj, (PyObject*)Name_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5333 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5334 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5335 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5336 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5337 identifier id;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5338 expr_context_ty ctx;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5339
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5340 if (PyObject_HasAttrString(obj, "id")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5341 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5342 tmp = PyObject_GetAttrString(obj, "id");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5343 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5344 res = obj2ast_identifier(tmp, &id, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5345 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5346 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5347 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5348 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5349 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	5350 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5351 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5352 if (PyObject_HasAttrString(obj, "ctx")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5353 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5354 tmp = PyObject_GetAttrString(obj, "ctx");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5355 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5356 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	5357 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5358 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5359 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5360 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5361 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	5362 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5363 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5364 *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	5365 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5366 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5367 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5368 isinstance = PyObject_IsInstance(obj, (PyObject*)List_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5369 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5370 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5371 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5372 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5373 asdl_seq* elts;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5374 expr_context_ty ctx;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5375
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5376 if (PyObject_HasAttrString(obj, "elts")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5377 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5378 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5379 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5380 tmp = PyObject_GetAttrString(obj, "elts");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5381 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5382 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5383 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	5384 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5385 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5386 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5387 elts = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5388 if (elts == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5389 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5390 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5391 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	5392 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5393 asdl_seq_SET(elts, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5394 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5395 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5396 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5397 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5398 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	5399 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5400 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5401 if (PyObject_HasAttrString(obj, "ctx")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5402 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5403 tmp = PyObject_GetAttrString(obj, "ctx");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5404 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5405 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	5406 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5407 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5408 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5409 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5410 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	5411 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5412 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5413 *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	5414 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5415 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5416 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5417 isinstance = PyObject_IsInstance(obj, (PyObject*)Tuple_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5418 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5419 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5420 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5421 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5422 asdl_seq* elts;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5423 expr_context_ty ctx;
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, "elts")) {
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 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5428 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5429 tmp = PyObject_GetAttrString(obj, "elts");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5430 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5431 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5432 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	5433 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5434 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5435 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5436 elts = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5437 if (elts == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5438 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5439 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5440 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	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 asdl_seq_SET(elts, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5443 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5444 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5445 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5446 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5447 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	5448 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5449 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5450 if (PyObject_HasAttrString(obj, "ctx")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5451 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5452 tmp = PyObject_GetAttrString(obj, "ctx");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5453 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5454 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	5455 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5456 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5457 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5458 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5459 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	5460 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5461 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5462 *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	5463 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5464 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5465 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5466
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5467 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5468 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	5469 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	5470 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5471 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5472 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5473 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5474
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5475 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5476 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	5477 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5478 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5479 int isinstance;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5480
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5481 isinstance = PyObject_IsInstance(obj, (PyObject *)Load_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5482 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5483 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5484 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5485 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5486 *out = Load;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5487 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5488 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5489 isinstance = PyObject_IsInstance(obj, (PyObject *)Store_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5490 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5491 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5492 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5493 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5494 *out = Store;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5495 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5496 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5497 isinstance = PyObject_IsInstance(obj, (PyObject *)Del_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5498 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5499 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5500 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5501 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5502 *out = Del;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5503 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5504 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5505 isinstance = PyObject_IsInstance(obj, (PyObject *)AugLoad_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5506 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5507 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5508 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5509 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5510 *out = AugLoad;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5511 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5512 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5513 isinstance = PyObject_IsInstance(obj, (PyObject *)AugStore_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5514 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5515 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5516 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5517 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5518 *out = AugStore;
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 *)Param_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 *out = Param;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5527 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5528 }
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 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5531 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	5532 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	5533 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5534 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5535 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5536 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5537
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5538 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5539 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	5540 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5541 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5542 int isinstance;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5543
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5544
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5545 if (obj == Py_None) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5546 *out = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5547 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5548 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5549 isinstance = PyObject_IsInstance(obj, (PyObject*)Ellipsis_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5550 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5551 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5552 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5553 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5554
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5555 *out = Ellipsis(arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5556 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5557 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5558 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5559 isinstance = PyObject_IsInstance(obj, (PyObject*)Slice_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5560 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5561 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5562 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5563 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5564 expr_ty lower;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5565 expr_ty upper;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5566 expr_ty step;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5567
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5568 if (PyObject_HasAttrString(obj, "lower")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5569 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5570 tmp = PyObject_GetAttrString(obj, "lower");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5571 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5572 res = obj2ast_expr(tmp, &lower, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5573 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5574 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5575 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5576 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5577 lower = NULL;
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, "upper")) {
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, "upper");
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, &upper, 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 upper = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5589 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5590 if (PyObject_HasAttrString(obj, "step")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5591 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5592 tmp = PyObject_GetAttrString(obj, "step");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5593 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5594 res = obj2ast_expr(tmp, &step, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5595 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5596 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5597 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5598 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5599 step = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5600 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5601 *out = Slice(lower, upper, step, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5602 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5603 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5604 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5605 isinstance = PyObject_IsInstance(obj, (PyObject*)ExtSlice_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5606 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5607 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5608 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5609 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5610 asdl_seq* dims;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5611
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5612 if (PyObject_HasAttrString(obj, "dims")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5613 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5614 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5615 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5616 tmp = PyObject_GetAttrString(obj, "dims");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5617 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5618 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5619 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	5620 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5621 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5622 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5623 dims = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5624 if (dims == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5625 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5626 slice_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5627 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	5628 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5629 asdl_seq_SET(dims, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5630 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5631 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5632 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5633 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5634 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	5635 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5636 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5637 *out = ExtSlice(dims, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5638 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5639 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5640 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5641 isinstance = PyObject_IsInstance(obj, (PyObject*)Index_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5642 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5643 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5644 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5645 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5646 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5647
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5648 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5649 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5650 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5651 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5652 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5653 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5654 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5655 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5656 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5657 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	5658 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5659 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5660 *out = Index(value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5661 if (*out == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5662 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5663 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5664
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5665 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5666 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	5667 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	5668 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5669 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5670 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5671 }
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 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5674 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	5675 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5676 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5677 int isinstance;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5678
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5679 isinstance = PyObject_IsInstance(obj, (PyObject *)And_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5680 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5681 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5682 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5683 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5684 *out = And;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5685 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5686 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5687 isinstance = PyObject_IsInstance(obj, (PyObject *)Or_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5688 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5689 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5690 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5691 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5692 *out = Or;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5693 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5694 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5695
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5696 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5697 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	5698 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	5699 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5700 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5701 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5702 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5703
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5704 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5705 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	5706 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5707 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5708 int isinstance;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5709
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5710 isinstance = PyObject_IsInstance(obj, (PyObject *)Add_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5711 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5712 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5713 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5714 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5715 *out = Add;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5716 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5717 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5718 isinstance = PyObject_IsInstance(obj, (PyObject *)Sub_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5719 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5720 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5721 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5722 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5723 *out = Sub;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5724 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5725 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5726 isinstance = PyObject_IsInstance(obj, (PyObject *)Mult_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5727 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5728 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5729 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5730 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5731 *out = Mult;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5732 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5733 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5734 isinstance = PyObject_IsInstance(obj, (PyObject *)Div_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5735 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5736 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5737 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5738 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5739 *out = Div;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5740 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5741 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5742 isinstance = PyObject_IsInstance(obj, (PyObject *)Mod_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5743 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5744 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5745 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5746 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5747 *out = Mod;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5748 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5749 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5750 isinstance = PyObject_IsInstance(obj, (PyObject *)Pow_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5751 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5752 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5753 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5754 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5755 *out = Pow;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5756 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5757 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5758 isinstance = PyObject_IsInstance(obj, (PyObject *)LShift_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5759 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5760 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5761 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5762 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5763 *out = LShift;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5764 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5765 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5766 isinstance = PyObject_IsInstance(obj, (PyObject *)RShift_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5767 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5768 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5769 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5770 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5771 *out = RShift;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5772 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5773 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5774 isinstance = PyObject_IsInstance(obj, (PyObject *)BitOr_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5775 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5776 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5777 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5778 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5779 *out = BitOr;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5780 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5781 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5782 isinstance = PyObject_IsInstance(obj, (PyObject *)BitXor_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5783 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5784 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5785 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5786 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5787 *out = BitXor;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5788 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5789 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5790 isinstance = PyObject_IsInstance(obj, (PyObject *)BitAnd_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5791 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5792 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5793 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5794 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5795 *out = BitAnd;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5796 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5797 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5798 isinstance = PyObject_IsInstance(obj, (PyObject *)FloorDiv_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5799 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5800 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5801 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5802 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5803 *out = FloorDiv;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5804 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5805 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5806
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5807 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5808 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	5809 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	5810 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5811 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5812 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5813 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5814
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5815 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5816 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	5817 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5818 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5819 int isinstance;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5820
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5821 isinstance = PyObject_IsInstance(obj, (PyObject *)Invert_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5822 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5823 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5824 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5825 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5826 *out = Invert;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5827 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5828 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5829 isinstance = PyObject_IsInstance(obj, (PyObject *)Not_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5830 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5831 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5832 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5833 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5834 *out = Not;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5835 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5836 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5837 isinstance = PyObject_IsInstance(obj, (PyObject *)UAdd_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5838 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5839 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5840 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5841 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5842 *out = UAdd;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5843 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5844 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5845 isinstance = PyObject_IsInstance(obj, (PyObject *)USub_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5846 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5847 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5848 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5849 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5850 *out = USub;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5851 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5852 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5853
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5854 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5855 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	5856 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	5857 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5858 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5859 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5860 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5861
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5862 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5863 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	5864 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5865 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5866 int isinstance;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5867
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5868 isinstance = PyObject_IsInstance(obj, (PyObject *)Eq_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5869 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5870 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5871 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5872 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5873 *out = Eq;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5874 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5875 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5876 isinstance = PyObject_IsInstance(obj, (PyObject *)NotEq_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5877 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5878 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5879 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5880 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5881 *out = NotEq;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5882 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5883 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5884 isinstance = PyObject_IsInstance(obj, (PyObject *)Lt_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5885 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5886 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5887 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5888 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5889 *out = Lt;
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 *)LtE_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 *out = LtE;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5898 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5899 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5900 isinstance = PyObject_IsInstance(obj, (PyObject *)Gt_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5901 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5902 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5903 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5904 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5905 *out = Gt;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5906 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5907 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5908 isinstance = PyObject_IsInstance(obj, (PyObject *)GtE_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5909 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5910 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5911 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5912 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5913 *out = GtE;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5914 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5915 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5916 isinstance = PyObject_IsInstance(obj, (PyObject *)Is_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5917 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5918 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5919 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5920 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5921 *out = Is;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5922 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5923 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5924 isinstance = PyObject_IsInstance(obj, (PyObject *)IsNot_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5925 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5926 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5927 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5928 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5929 *out = IsNot;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5930 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5931 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5932 isinstance = PyObject_IsInstance(obj, (PyObject *)In_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5933 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5934 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5935 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5936 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5937 *out = In;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5938 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5939 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5940 isinstance = PyObject_IsInstance(obj, (PyObject *)NotIn_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5941 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5942 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5943 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	5944 if (isinstance) {
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5945 *out = NotIn;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5946 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5947 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5948
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5949 tmp = PyObject_Repr(obj);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5950 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	5951 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	5952 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5953 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5954 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5955 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5956
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5957 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5958 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	5959 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5960 PyObject* tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5961 expr_ty target;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5962 expr_ty iter;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5963 asdl_seq* ifs;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5964
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5965 if (PyObject_HasAttrString(obj, "target")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5966 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5967 tmp = PyObject_GetAttrString(obj, "target");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5968 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5969 res = obj2ast_expr(tmp, &target, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5970 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5971 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5972 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5973 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5974 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	5975 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5976 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5977 if (PyObject_HasAttrString(obj, "iter")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5978 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5979 tmp = PyObject_GetAttrString(obj, "iter");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5980 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5981 res = obj2ast_expr(tmp, &iter, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5982 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5983 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5984 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5985 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5986 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	5987 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5988 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5989 if (PyObject_HasAttrString(obj, "ifs")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5990 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5991 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5992 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5993 tmp = PyObject_GetAttrString(obj, "ifs");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5994 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5995 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5996 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	5997 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5998 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	5999 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6000 ifs = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6001 if (ifs == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6002 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6003 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6004 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	6005 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6006 asdl_seq_SET(ifs, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6007 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6008 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6009 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6010 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6011 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	6012 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6013 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6014 *out = comprehension(target, iter, ifs, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6015 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6016 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6017 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6018 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6019 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6020
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6021 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6022 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	6023 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6024 PyObject* tmp = NULL;
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6025 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	6026
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6027 int lineno;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6028 int col_offset;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6029
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	6030 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	6031 *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	6032 return 0;
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6033 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6034 if (PyObject_HasAttrString(obj, "lineno")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6035 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6036 tmp = PyObject_GetAttrString(obj, "lineno");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6037 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6038 res = obj2ast_int(tmp, &lineno, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6039 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6040 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6041 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6042 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6043 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	6044 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6045 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6046 if (PyObject_HasAttrString(obj, "col_offset")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6047 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6048 tmp = PyObject_GetAttrString(obj, "col_offset");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6049 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6050 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	6051 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6052 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6053 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6054 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6055 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	6056 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6057 }
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6058 isinstance = PyObject_IsInstance(obj, (PyObject*)ExceptHandler_type);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6059 if (isinstance == -1) {
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6060 return 1;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6061 }
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6062 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	6063 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	6064 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	6065 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	6066
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6067 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	6068 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	6069 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	6070 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	6071 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	6072 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	6073 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	6074 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	6075 } 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	6076 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	6077 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6078 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	6079 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	6080 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	6081 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	6082 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	6083 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	6084 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	6085 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	6086 } 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	6087 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	6088 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6089 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	6090 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	6091 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	6092 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	6093 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	6094 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	6095 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	6096 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	6097 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	6098 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6099 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	6100 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	6101 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	6102 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	6103 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	6104 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	6105 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	6106 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	6107 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6108 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	6109 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	6110 } 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	6111 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	6112 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	6113 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6114 *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	6115 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	6116 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	6117 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	6118 }
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6119
2ff88ae9850c Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. Georg Brandl <georg@python.org> parents: 46193 diff changeset	6120 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	6121 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	6122 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	6123 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6124 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6125 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6126 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6127
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6128 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6129 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	6130 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6131 PyObject* tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6132 asdl_seq* args;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6133 identifier vararg;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6134 identifier kwarg;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6135 asdl_seq* defaults;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6136
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6137 if (PyObject_HasAttrString(obj, "args")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6138 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6139 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6140 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6141 tmp = PyObject_GetAttrString(obj, "args");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6142 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6143 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6144 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	6145 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6146 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6147 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6148 args = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6149 if (args == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6150 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6151 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6152 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	6153 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6154 asdl_seq_SET(args, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6155 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6156 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6157 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6158 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6159 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	6160 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6161 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6162 if (PyObject_HasAttrString(obj, "vararg")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6163 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6164 tmp = PyObject_GetAttrString(obj, "vararg");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6165 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6166 res = obj2ast_identifier(tmp, &vararg, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6167 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6168 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6169 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6170 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6171 vararg = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6172 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6173 if (PyObject_HasAttrString(obj, "kwarg")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6174 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6175 tmp = PyObject_GetAttrString(obj, "kwarg");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6176 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6177 res = obj2ast_identifier(tmp, &kwarg, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6178 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6179 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6180 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6181 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6182 kwarg = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6183 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6184 if (PyObject_HasAttrString(obj, "defaults")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6185 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6186 Py_ssize_t len;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6187 Py_ssize_t i;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6188 tmp = PyObject_GetAttrString(obj, "defaults");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6189 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6190 if (!PyList_Check(tmp)) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6191 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	6192 goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6193 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6194 len = PyList_GET_SIZE(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6195 defaults = asdl_seq_new(len, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6196 if (defaults == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6197 for (i = 0; i < len; i++) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6198 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6199 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	6200 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6201 asdl_seq_SET(defaults, i, value);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6202 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6203 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6204 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6205 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6206 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	6207 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6208 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6209 *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	6210 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6211 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6212 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6213 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6214 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6215
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6216 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6217 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	6218 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6219 PyObject* tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6220 identifier arg;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6221 expr_ty value;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6222
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6223 if (PyObject_HasAttrString(obj, "arg")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6224 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6225 tmp = PyObject_GetAttrString(obj, "arg");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6226 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6227 res = obj2ast_identifier(tmp, &arg, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6228 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6229 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6230 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6231 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6232 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	6233 return 1;
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 if (PyObject_HasAttrString(obj, "value")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6236 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6237 tmp = PyObject_GetAttrString(obj, "value");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6238 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6239 res = obj2ast_expr(tmp, &value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6240 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6241 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6242 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6243 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6244 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	6245 return 1;
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 *out = keyword(arg, value, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6248 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6249 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6250 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6251 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6252 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6253
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6254 int
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6255 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	6256 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6257 PyObject* tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6258 identifier name;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6259 identifier asname;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6260
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6261 if (PyObject_HasAttrString(obj, "name")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6262 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6263 tmp = PyObject_GetAttrString(obj, "name");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6264 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6265 res = obj2ast_identifier(tmp, &name, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6266 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6267 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6268 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6269 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6270 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	6271 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6272 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6273 if (PyObject_HasAttrString(obj, "asname")) {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6274 int res;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6275 tmp = PyObject_GetAttrString(obj, "asname");
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6276 if (tmp == NULL) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6277 res = obj2ast_identifier(tmp, &asname, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6278 if (res != 0) goto failed;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6279 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6280 tmp = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6281 } else {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6282 asname = NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6283 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6284 *out = alias(name, asname, arena);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6285 return 0;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6286 failed:
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6287 Py_XDECREF(tmp);
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6288 return 1;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6289 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6290
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6291
36669 9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6292 PyMODINIT_FUNC
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6293 init_ast(void)
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6294 {
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6295 PyObject m, d;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6296 if (!init_types()) return;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6297 m = Py_InitModule3("_ast", NULL, NULL);
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6298 if (!m) return;
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6299 d = PyModule_GetDict(m);
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	6300 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	6301 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	6302 return;
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	6303 if (PyModule_AddStringConstant(m, "__version__", "62047") < 0)
36707 cd847e726837 Regenerate. Martin v. Löwis <martin@v.loewis.de> parents: 36695 diff changeset	6304 return;
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6305 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	6306 if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6307 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6308 if (PyDict_SetItemString(d, "Interactive", (PyObject*)Interactive_type)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6309 < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6310 if (PyDict_SetItemString(d, "Expression", (PyObject*)Expression_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6311 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6312 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	6313 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	6314 if (PyDict_SetItemString(d, "FunctionDef", (PyObject*)FunctionDef_type)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6315 < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6316 if (PyDict_SetItemString(d, "ClassDef", (PyObject*)ClassDef_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6317 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6318 if (PyDict_SetItemString(d, "Return", (PyObject*)Return_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6319 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6320 if (PyDict_SetItemString(d, "Delete", (PyObject*)Delete_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6321 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6322 if (PyDict_SetItemString(d, "Assign", (PyObject*)Assign_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6323 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6324 if (PyDict_SetItemString(d, "AugAssign", (PyObject*)AugAssign_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6325 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6326 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	6327 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	6328 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	6329 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	6330 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	6331 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	6332 if (PyDict_SetItemString(d, "TryExcept", (PyObject*)TryExcept_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6333 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6334 if (PyDict_SetItemString(d, "TryFinally", (PyObject*)TryFinally_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6335 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6336 if (PyDict_SetItemString(d, "Assert", (PyObject*)Assert_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6337 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6338 if (PyDict_SetItemString(d, "Import", (PyObject*)Import_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6339 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6340 if (PyDict_SetItemString(d, "ImportFrom", (PyObject*)ImportFrom_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6341 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6342 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	6343 if (PyDict_SetItemString(d, "Global", (PyObject*)Global_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6344 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6345 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	6346 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	6347 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	6348 if (PyDict_SetItemString(d, "Continue", (PyObject*)Continue_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6349 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6350 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	6351 if (PyDict_SetItemString(d, "BoolOp", (PyObject*)BoolOp_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6352 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6353 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	6354 if (PyDict_SetItemString(d, "UnaryOp", (PyObject*)UnaryOp_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6355 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6356 if (PyDict_SetItemString(d, "Lambda", (PyObject*)Lambda_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6357 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6358 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	6359 if (PyDict_SetItemString(d, "Dict", (PyObject*)Dict_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6360 if (PyDict_SetItemString(d, "ListComp", (PyObject*)ListComp_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6361 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6362 if (PyDict_SetItemString(d, "GeneratorExp",
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6363 (PyObject*)GeneratorExp_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6364 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	6365 if (PyDict_SetItemString(d, "Compare", (PyObject*)Compare_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6366 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6367 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	6368 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	6369 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	6370 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	6371 if (PyDict_SetItemString(d, "Attribute", (PyObject*)Attribute_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6372 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6373 if (PyDict_SetItemString(d, "Subscript", (PyObject*)Subscript_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6374 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6375 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	6376 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	6377 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	6378 if (PyDict_SetItemString(d, "expr_context",
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6379 (PyObject*)expr_context_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6380 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	6381 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	6382 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	6383 if (PyDict_SetItemString(d, "AugLoad", (PyObject*)AugLoad_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6384 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6385 if (PyDict_SetItemString(d, "AugStore", (PyObject*)AugStore_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6386 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6387 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	6388 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	6389 if (PyDict_SetItemString(d, "Ellipsis", (PyObject*)Ellipsis_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6390 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6391 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	6392 if (PyDict_SetItemString(d, "ExtSlice", (PyObject*)ExtSlice_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6393 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6394 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	6395 if (PyDict_SetItemString(d, "boolop", (PyObject*)boolop_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6396 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6397 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	6398 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	6399 if (PyDict_SetItemString(d, "operator", (PyObject*)operator_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6400 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6401 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	6402 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	6403 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	6404 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	6405 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	6406 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	6407 if (PyDict_SetItemString(d, "LShift", (PyObject*)LShift_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6408 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6409 if (PyDict_SetItemString(d, "RShift", (PyObject*)RShift_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6410 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6411 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	6412 if (PyDict_SetItemString(d, "BitXor", (PyObject*)BitXor_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6413 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6414 if (PyDict_SetItemString(d, "BitAnd", (PyObject*)BitAnd_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6415 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6416 if (PyDict_SetItemString(d, "FloorDiv", (PyObject*)FloorDiv_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6417 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6418 if (PyDict_SetItemString(d, "unaryop", (PyObject*)unaryop_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6419 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6420 if (PyDict_SetItemString(d, "Invert", (PyObject*)Invert_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6421 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6422 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	6423 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	6424 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	6425 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	6426 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	6427 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	6428 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	6429 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	6430 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	6431 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	6432 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	6433 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	6434 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	6435 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	6436 if (PyDict_SetItemString(d, "comprehension",
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6437 (PyObject*)comprehension_type) < 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6438 if (PyDict_SetItemString(d, "excepthandler",
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6439 (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	6440 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	6441 (PyObject*)ExceptHandler_type) < 0) return;
37412 dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6442 if (PyDict_SetItemString(d, "arguments", (PyObject*)arguments_type) <
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6443 0) return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6444 if (PyDict_SetItemString(d, "keyword", (PyObject*)keyword_type) < 0)
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6445 return;
dfc33ec7f73a * Fix a refleak of _attributes. Neal Norwitz <nnorwitz@gmail.com>* parents: 36794 diff changeset	6446 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	6447 }
9504f7ac3669 Create _ast module. Martin v. Löwis <martin@v.loewis.de> parents: 36666 diff changeset	6448
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6449
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	6450 PyObject* PyAST_mod2obj(mod_ty t)
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6451 {
36660 3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	6452 init_types();
3c0b26113df6 Generate code to recursively copy an AST into Martin v. Löwis <martin@v.loewis.de> parents: 36174 diff changeset	6453 return ast2obj_mod(t);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6454 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	6455
46193 b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6456 /* 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	6457 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	6458 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6459 mod_ty res;
46193 b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6460 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	6461 (PyObject*)Interactive_type};
b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6462 char *req_name[] = {"Module", "Expression", "Interactive"};
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6463 int isinstance;
46193 b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6464 assert(0 <= mode && mode <= 2);
b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6465
46162 ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6466 init_types();
46193 b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6467
57674 2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6468 isinstance = PyObject_IsInstance(ast, req_type[mode]);
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6469 if (isinstance == -1)
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6470 return NULL;
2b934d466993 Merged revisions 76774 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49677 diff changeset	6471 if (!isinstance) {
46193 b0bf06d49647 Properly check for consistency with the third argument of Georg Brandl <georg@python.org> parents: 46168 diff changeset	6472 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	6473 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	6474 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6475 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6476 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	6477 return NULL;
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6478 else
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6479 return res;
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
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6482 int PyAST_Check(PyObject* obj)
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6483 {
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6484 init_types();
46202 42c5d287a852 #2505: allow easier creation of AST nodes. Georg Brandl <georg@python.org> parents: 46200 diff changeset	6485 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	6486 }
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6487
ca38f7a4b4c9 Patch #1810 by Thomas Lee, reviewed by myself: Georg Brandl <georg@python.org> parents: 45470 diff changeset	6488

Mercurial > cpython-lru_cache-weakref

annotate Python/Python-ast.c @ 61774:55e2368f72f2 2.6